Merge branch 'testing' into 0.9.x

Conflicts:
	lib/iomaster.php

diff --cc classes/File.php
Simple merge

diff --cc lib/api.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/iomaster.php
Simple merge

diff --cc lib/queuemanager.php
index 64bb52e106ee7289bf03934ebb32b145f33315d5,8f8c8f133ffcea17ad51f4f6c8229e5704779e49..710829e497902f5f61731298b448f6ae39e37b62
--- 1/lib/queuemanager.php
--- 2/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@@ -212,15 -213,13 +213,15 @@@ abstract class QueueManager extends IoM
      {
          if (isset($this->handlers[$queue])) {
              $class = $this->handlers[$queue];
 -            if (class_exists($class)) {
 +            if(is_object($class)) {
 +                return $class;
 +            } else if (class_exists($class)) {
                  return new $class();
              } else {
-                 common_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'");
+                 $this->_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'");
              }
          } else {
-             common_log(LOG_ERR, "Requested handler for unkown queue '$queue'");
+             $this->_log(LOG_ERR, "Requested handler for unkown queue '$queue'");
          }
          return null;
      }
@@@ -275,10 -283,10 +285,10 @@@
       * Only registered transports will be reliably picked up!
       *
       * @param string $transport
 -     * @param string $class
 +     * @param string $class class name or object instance
       * @param string $group
       */
-     public function connect($transport, $class, $group='queuedaemon')
+     public function connect($transport, $class, $group='main')
      {
          $this->handlers[$transport] = $class;
          $this->groups[$group][$transport] = $class;

diff --cc lib/util.php
Simple merge