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

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/default.php b/lib/default.php
index 7d9a37174..fa4ece10a 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -299,4 +299,8 @@ $default =
               ),
         'api' =>
         array('realm' => null),
+        'nofollow' =>
+        array('subscribers' => true,
+              'members' => true,
+              'peopletag' => true),
         );