Merge branch 'testing' into 0.9.x

diff --combined lib/default.php
index a9be3438b163d1cded938dc38ddc3e1a3ab6cc7b,4f3ea00f2abc11a8bebed8527257e2b0273fa686..37eb6cafa2bd0b9cf60e558ba92eadff27d3fefe
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -91,10 -91,13 +91,13 @@@ $default 
                'spawndelay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup
                'debug_memory' => false, // true to spit memory usage to log
                'inboxes' => true, // true to do inbox distribution & output queueing from in background via 'distrib' queue
-               'breakout' => array('*' => 'shared'), // set global or per-handler queue breakout
-                                       // 'shared': use a shared queue for all sites
-                                       // 'handler': share each/this handler over multiple sites
-                                       // 'site': break out for each/this handler on this site
+               'breakout' => array(), // List queue specifiers to break out when using Stomp queue.
+                                      // Default will share all queues for all sites within each group.
+                                      // Specify as <group>/<queue> or <group>/<queue>/<site>,
+                                      // using nickname identifier as site.
+                                      //
+                                      // 'main/distrib' separate "distrib" queue covering all sites
+                                      // 'xmpp/xmppout/mysite' separate "xmppout" queue covering just 'mysite'
                'max_retries' => 10, // drop messages after N failed attempts to process (Stomp)
                'dead_letter_dir' => false, // set to directory to save dropped messages into (Stomp)
                ),
@@@ -277,8 -280,6 +280,8 @@@
                                   'Mapstraction' => null,
                                   'Linkback' => null,
                                   'WikiHashtags' => null,
 +                                 'PubSubHubBub' => null,
 +                                 'RSSCloud' => null,
                                   'OpenID' => null),
                ),
          'admin' =>

diff --combined lib/iomaster.php
index 3745a5c7a9b6caede91ef727955820e0d8118159,d20837ba54a3dac70e5731a2eb1b705912beb8ac..7cfb2c9a0ff18c59039cfdae634c728ec9fc8282
--- 1/lib/iomaster.php
--- 2/lib/iomaster.php
+++ b/lib/iomaster.php
@@@ -55,27 -55,18 +55,18 @@@ abstract class IoMaste
          if ($multiSite !== null) {
              $this->multiSite = $multiSite;
          }
-         if ($this->multiSite) {
-             $this->sites = StatusNet::findAllSites();
-         } else {
-             $this->sites = array(StatusNet::currentSite());
-         }
- 
-         if (empty($this->sites)) {
-             throw new Exception("Empty status_network table, cannot init");
-         }
  
-         foreach ($this->sites as $site) {
-             StatusNet::switchSite($site);
-             $this->initManagers();
-         }
+         $this->initManagers();
      }
  
      /**
-      * Initialize IoManagers for the currently configured site
-      * which are appropriate to this instance.
+      * Initialize IoManagers which are appropriate to this instance;
+      * pass class names or instances into $this->instantiate().
+      *
+      * If setup and configuration may vary between sites in multi-site
+      * mode, it's the subclass's responsibility to set them up here.
       *
-      * Pass class names into $this->instantiate()
+      * Switching site configurations is an acceptable side effect.
       */
      abstract function initManagers();
  
@@@ -339,7 -330,7 +330,7 @@@
       * for per-queue and per-site records.
       *
       * @param string $key counter name
 -     * @param array $owners list of owner keys like 'queue:jabber' or 'site:stat01'
 +     * @param array $owners list of owner keys like 'queue:xmpp' or 'site:stat01'
       */
      public function stats($key, $owners=array())
      {