Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

2009-11-08 23:33:58 +01:00
parent 5ab709b739 fc5002015b
commit b10f362ede
75 changed files with 7718 additions and 4851 deletions
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -43,7 +43,7 @@ class XmppQueueHandler extends QueueHandler
        $this->conn = jabber_connect($this->_id.$this->transport());

        if (empty($this->conn)) {
-            $this->log(LOG_ERR, "Could not connect to server.");
+            $this->log(LOG_ERR, "Couldn't connect to server.");
            return false;
        }