Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Fri, 20 Dec 2013 20:50:17 +0000 (13:50 -0700)
committerPeter Saint-Andre <stpeter@stpeter.im>
Fri, 20 Dec 2013 20:50:17 +0000 (13:50 -0700)
commitaa0f6f3d8014bf664c2ccb9974d7d5d07342a947
tree7df9fc4399aaa4ad31ec8aee33fa221e883dfe75
parent02dbdfe161f3de60c02258dd9b1369fa268af179
parenteac32456a1229fba7e38610369bc26e1edf943f1
Merge branch 'master' of athena.jabber.org:xmpp