Merge branch '0.9.x' into adminpanel

Conflicts:
	classes/User.php

1 files changed, 1 insertions, 1 deletions

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);