merge
authorArt Cancro <ajc@uncensored.citadel.org>
Wed, 31 Dec 2014 15:53:32 +0000 (10:53 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Wed, 31 Dec 2014 15:53:32 +0000 (10:53 -0500)
commit313ec8cd15d8b4b0490862ef294f3aaa6390172c
tree9b76b51c91ea018f81338824eb26d73a225e6a37
parent73bcf6081a14008eb1020126273f133a324bb910
merge
citadel/modules/xmpp/serv_xmpp.c
citadel/modules/xmpp/xmpp_presence.c
citadel/modules/xmpp/xmpp_query_namespace.c