Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Tue, 27 Aug 2013 21:18:54 +0000 (15:18 -0600)
committerPeter Saint-Andre <stpeter@stpeter.im>
Tue, 27 Aug 2013 21:18:54 +0000 (15:18 -0600)
commita41a4861bbe9acd99acb2cc57ce72ecf12090819
tree44ca2429f1df1c6976a49c7b5cf70bbd439166da
parentf6e18f3f71be7c7a242b21c684d8ba58e447a424
parent2f888c8ba62e60445b2bce4576ce578fd98a116c
Merge branch 'master' of athena.jabber.org:xmpp