Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

diff --cc actions/apistatusesdestroy.php
Simple merge

diff --cc actions/designadminpanel.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/adminpanelaction.php
Simple merge

diff --cc lib/apiaction.php
Simple merge

diff --cc lib/installer.php
Simple merge