Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Tue, 3 Dec 2013 01:46:20 +0000 (18:46 -0700)
committerPeter Saint-Andre <stpeter@stpeter.im>
Tue, 3 Dec 2013 01:46:20 +0000 (18:46 -0700)
commitfc780b58be65324392efc0992965dcdf51e82416
tree54490f7795d4bc76bb763cc931201212b1309eac
parent1e61df05c26840b9337be84d1ccd79e3c16f31a2
parentfcbad54a7314afbf0365784c3c37531ef4ade5b4
Merge branch 'master' of athena.jabber.org:xmpp