Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Mon, 6 Jan 2014 21:55:55 +0000 (14:55 -0700)
committerPeter Saint-Andre <stpeter@stpeter.im>
Mon, 6 Jan 2014 21:55:55 +0000 (14:55 -0700)
commit4870c2f55b7851635c8b9769c6544e9a8a41801b
tree3181190b326a8fa2a0bd24f771da520be908aca4
parentaf1ad45f257ab1cd87b4f71c28f5eb289a133404
parentcc61a4399aa5585541c73d838d67ea39cbcdafb6
Merge branch 'master' of athena.jabber.org:xmpp