Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorArt Cancro <ajc@uncensored.citadel.org>
Wed, 31 Dec 2014 15:26:45 +0000 (10:26 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Wed, 31 Dec 2014 15:26:45 +0000 (10:26 -0500)
commit73bcf6081a14008eb1020126273f133a324bb910
tree966576c046cb2f9567385e610c436807de546482
parentd12e2c1685d3754601d4015c486f6aeb2b22795e
parent1c0b8162b0a90f2e97028a531005c11b09441498
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

Conflicts:
citadel/modules/xmpp/serv_xmpp.c
citadel/modules/xmpp/xmpp_presence.c
citadel/modules/xmpp/xmpp_query_namespace.c
citadel/modules/xmpp/serv_xmpp.c
citadel/modules/xmpp/xmpp_presence.c
citadel/modules/xmpp/xmpp_query_namespace.c