From: Brion Vibber <brion@pobox.com>
Date: Thu, 4 Mar 2010 18:16:59 +0000 (-0800)
Subject: Merge branch 'testing' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f969d6349c244e2ec32c3ebe7eb355426006f4db;p=quix0rs-gnu-social.git

Merge branch 'testing' into 0.9.x

Conflicts:
	db/08to09.sql
---

f969d6349c244e2ec32c3ebe7eb355426006f4db
diff --cc lib/default.php
index c46c3eef57,bdd78d4d86..f22d8b24a9
--- a/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' =>