Merge branch 'master' into testing

Conflicts:
	lib/queuemanager.php

diff --cc actions/apistatusesupdate.php
Simple merge

diff --cc classes/Memcached_DataObject.php
Simple merge

diff --cc lib/queuemanager.php
index 4eb39bfa8c72ecf75ef76630244b3a513fe42a97,e5cf8239e9cb1ee49dd5681032995b20a8eaa412..1bc8de1f787178598ac0cfef3f238c895f546fd7
--- 1/lib/queuemanager.php
--- 2/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@@ -224,7 -225,7 +225,6 @@@ abstract class QueueManager extends IoM
              // XMPP output handlers...
              $this->connect('jabber', 'JabberQueueHandler');
              $this->connect('public', 'PublicQueueHandler');
-             
 -
              // @fixme this should get an actual queue
              //$this->connect('confirm', 'XmppConfirmHandler');