desc
Merge branch 'master' of https://github.com/espectro/JSON-XMPP