Merge branch 'master' into 0.9.x

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/iomaster.php b/lib/iomaster.php
index aff5b145c..5d1071a39 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -231,7 +231,7 @@ class IoMaster
                 return -1;
             }
         } else {
-            return $this->parseMemoryLimit($limit);
+            return $this->parseMemoryLimit($softLimit);
         }
         return $softLimit;
     }
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index 9662e97d1..0839cda57 100644
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -81,7 +81,7 @@ class XmppManager extends IoManager
         parent::start($master);
         $this->switchSite();
 
-        require_once "lib/jabber.php";
+        require_once INSTALLDIR . "/lib/jabber.php";
 
         # Low priority; we don't want to receive messages