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

2009-10-21 22:41:42 -04:00
parent 0df85711d6 5e536a6614
commit 4e639b8769
19 changed files with 388 additions and 224 deletions
--- a/lib/default.php
+++ b/lib/default.php
@@ -140,7 +140,7 @@ $default =
        array('enabled' => true),
        'sms' =>
        array('enabled' => true),
-        'twitterbridge' =>
+        'twitterimport' =>
        array('enabled' => false),
        'integration' =>
        array('source' => 'StatusNet', # source attribute for Twitter