Merge branch 'master' into testing

Conflicts:
	lib/queuemanager.php

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 4eb39bfa8..1bc8de1f7 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -217,6 +217,7 @@ abstract class QueueManager extends IoManager
             $this->connect('plugin', 'PluginQueueHandler');
             $this->connect('omb', 'OmbQueueHandler');
             $this->connect('ping', 'PingQueueHandler');
+            $this->connect('distrib', 'DistribQueueHandler');
             if (common_config('sms', 'enabled')) {
                 $this->connect('sms', 'SmsQueueHandler');
             }
@@ -224,7 +225,6 @@ abstract class QueueManager extends IoManager
             // XMPP output handlers...
             $this->connect('jabber', 'JabberQueueHandler');
             $this->connect('public', 'PublicQueueHandler');
-            
             // @fixme this should get an actual queue
             //$this->connect('confirm', 'XmppConfirmHandler');