Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Sun, 5 Jan 2014 23:39:56 +0000 (16:39 -0700)
committerPeter Saint-Andre <stpeter@stpeter.im>
Sun, 5 Jan 2014 23:39:56 +0000 (16:39 -0700)
commitcc61a4399aa5585541c73d838d67ea39cbcdafb6
treedbf1165432d509a3e9c08dea76c9c64cd6e63082
parent9e628dfb898af579668b802de26c44dc87b3ed77
parentaa0f6f3d8014bf664c2ccb9974d7d5d07342a947
Merge branch 'master' of athena.jabber.org:xmpp