Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Tue, 19 Nov 2013 21:47:51 +0000 (14:47 -0700)
committerPeter Saint-Andre <stpeter@stpeter.im>
Tue, 19 Nov 2013 21:47:51 +0000 (14:47 -0700)
commit6430ec9cb57f29152aeb8805b88271a8f3d4a1cf
treec684c9144e37dc2e6a795df05bf17f8f6336eab8
parent22f1a859af2c055a47aaecf73b3c63facf4fdfef
parent4f94faa62236f812943c051e8822a6ba99d15da7
Merge branch 'master' of athena.jabber.org:xmpp