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

2 files changed, 1 insertions, 3 deletions

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index c7ed15e49..2e3974136 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -34,8 +34,6 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 require_once INSTALLDIR . '/lib/jabber.php';
 require_once INSTALLDIR . '/lib/xmppqueuehandler.php';
 
-define('CLAIM_TIMEOUT', 1200);
-
 class XmppConfirmHandler extends XmppQueueHandler
 {
     var $_id = 'confirm';
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index b2efc07c3..e52e2a6af 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -187,7 +187,7 @@ class XMPPDaemon extends Daemon
             return;
         }
         if ($this->handle_command($user, $pl['body'])) {
-            $this->log(LOG_INFO, "Command messag by $from handled.");
+            $this->log(LOG_INFO, "Command message by $from handled.");
             return;
         } else if ($this->is_autoreply($pl['body'])) {
             $this->log(LOG_INFO, 'Ignoring auto reply from ' . $from);