Revert some of the later changes in XMPP and fix other parts
authorArt Cancro <ajc@uncensored.citadel.org>
Wed, 31 Dec 2014 15:25:34 +0000 (10:25 -0500)
committerArt Cancro <ajc@uncensored.citadel.org>
Wed, 31 Dec 2014 15:25:34 +0000 (10:25 -0500)

No differences found