Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Tue, 10 Dec 2013 21:02:56 +0000 (14:02 -0700)
committerPeter Saint-Andre <stpeter@stpeter.im>
Tue, 10 Dec 2013 21:02:56 +0000 (14:02 -0700)
commitaccb13feebc4385053bb552aa6950a6fdfd1fb2f
treef25538c407cab83f16fe4ceef167d3d008e0eb1a
parent77c5505950640d9573018a3abfd43a18c67159ca
parent4a29d83d58d6630e02bfe4872e1ba57ce1faef90
Merge branch 'master' of athena.jabber.org:xmpp