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

2010-02-21 11:12:56 -08:00
parent 86f2f530ef 3e7a2a4014
commit 85528ccb1f
418 changed files with 26974 additions and 6612 deletions
--- a/scripts/queuedaemon.php
+++ b/scripts/queuedaemon.php
@@ -126,8 +126,7 @@ class QueueDaemon extends SpawningDaemon
 class QueueMaster extends IoMaster
 {
    /**
-     * Initialize IoManagers for the currently configured site
-     * which are appropriate to this instance.
+     * Initialize IoManagers which are appropriate to this instance.
     */
    function initManagers()
    {