Merge remote-tracking branch 'lucian/master'

2014-04-22 23:53:15 +01:00
parent 2c15aba92a 1192e67cf7
commit 1a0f12b0e6
8 changed files with 83 additions and 10 deletions
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -522,4 +522,3 @@ message_init_module(void)
    message_send_inactive = _message_send_inactive;
    message_send_gone = _message_send_gone;
 }
-