Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Mon, 24 Mar 2014 15:18:50 +0000 (09:18 -0600)
committerPeter Saint-Andre <stpeter@stpeter.im>
Mon, 24 Mar 2014 15:18:50 +0000 (09:18 -0600)
commit400e5054e2bfdf9e272c993857a5e3c8fe38ca51
tree7319ab78455ba81bd7079b1620a2a7fb62d42cb8
parent8c3188bdbd912438836272da81d533e78ad88cd3
parent40cb6b1895cbb63a4c8ef367c56531288658bd3f
Merge branch 'master' of athena.jabber.org:xmpp