Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Wed, 23 Oct 2013 18:36:37 +0000 (12:36 -0600)
committerPeter Saint-Andre <stpeter@stpeter.im>
Wed, 23 Oct 2013 18:36:37 +0000 (12:36 -0600)
commit7040804bade74996e8f8e6b0fa148b16046bae24
treef720e010e864e01bc46e9685116c79b47336016f
parent4f3734647b9d32e06f95d19fe9970a0882213d1e
parent61a773d21f66e2048509de5d6db1a2dd432e961b
Merge branch 'master' of athena.jabber.org:xmpp