Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Wed, 23 Oct 2013 22:52:38 +0000 (16:52 -0600)
committerPeter Saint-Andre <stpeter@stpeter.im>
Wed, 23 Oct 2013 22:52:38 +0000 (16:52 -0600)
commit8357fa7c7ba3ad5f57d1c0d42135197d7f1adb18
tree8298d055b622b996a478ef5bd50a784973e040b8
parent524035e2a549d30bfb15f8bd81a2cf8b875b5e0b
parentf55443832f547a29406bfc7197eb123e3b910a70
Merge branch 'master' of athena.jabber.org:xmpp