From: Evan Prodromou <evan@status.net>
Date: Mon, 25 Jan 2010 23:13:09 +0000 (-0500)
Subject: Merge branch 'master' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=663e4e02a1b3b1c104c2c3db19e524a486c3d981;p=quix0rs-gnu-social.git

Merge branch 'master' into testing

Conflicts:
	lib/queuemanager.php
---

663e4e02a1b3b1c104c2c3db19e524a486c3d981
diff --cc lib/queuemanager.php
index 4eb39bfa8c,e5cf8239e9..1bc8de1f78
--- a/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');