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

Conflicts:
	lib/channel.php
	scripts/imdaemon.php

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/default.php b/lib/default.php
index f22d8b24a..10f3f1a97 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -294,4 +294,6 @@ $default =
         array('crawldelay' => 0,
               'disallow' => array('main', 'settings', 'admin', 'search', 'message')
               ),
+        'api' =>
+        array('realm' => null),
         );