Merge branch 'master' of git@gitorious.org:statusnet/mainline

[quix0rs-gnu-social.git] / lib / xmppmanager.php

diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index f376358555ab1aa4f442da174925fa01e6add3e7..cca54db08da4b4a016354ffa1b685564c9900fe8 100644 (file)
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -36,6 +36,7 @@ class XmppManager extends IoManager
     protected $site = null;
     protected $pingid = 0;
     protected $lastping = null;
+    protected $conn = null;
 
     static protected $singletons = array();