Merge branch 'testing' into 0.9.x

Conflicts:
	db/08to09.sql

diff --cc lib/adminpanelaction.php
Simple merge

diff --cc lib/default.php
index c46c3eef57abd7d8b5e12f6e5c15ddf8a2992305,bdd78d4d8618cdc01edc7ab28d8692372c6db4c3..f22d8b24a90af5959d4481f1533ac409cb1e5735
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -280,8 -280,8 +280,9 @@@ $default 
                                   'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'),
                                   'Geonames' => null,
                                   'Mapstraction' => null,
+                                  'OStatus' => null,
                                   'WikiHashtags' => null,
 +                                 'RSSCloud' => null,
                                   'OpenID' => null),
                ),
          'admin' =>

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge