Merge remote-tracking branch 'origin/master'

README

@@ -2,8 +2,8 @@
 README
 ------
 
-StatusNet 1.1.0-alpha1
-3 October 2011
+StatusNet 1.1.0
+2 July 2012
 
 This is the README file for StatusNet, the Open Source social
 networking platform. It includes general information about the

lib/framework.php

@@ -20,7 +20,7 @@
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('STATUSNET_BASE_VERSION', '1.1.0');
-define('STATUSNET_LIFECYCLE', 'alpha1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . '-' . STATUSNET_LIFECYCLE);
 
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility

plugins/Realtime/RealtimePlugin.php

@@ -253,6 +253,7 @@ class RealtimePlugin extends Plugin
                 list($action, $arg1, $arg2) = $path;
 
                 $channels = Realtime_channel::getAllChannels($action, $arg1, $arg2);
+                $this->log(LOG_INFO, sprintf(_("%d candidate channels for notice %d"), $notice->id));
 
                 foreach ($channels as $channel) {