Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Tue, 5 Nov 2013 15:04:05 +0000 (07:04 -0800)
committerPeter Saint-Andre <stpeter@stpeter.im>
Tue, 5 Nov 2013 15:04:05 +0000 (07:04 -0800)
commit6dfc255b5e00616e9af826cdaaa29d89a642a14d
tree71c66d5fc9c3b465f49743d5be7890131b43cea1
parent433aeb321b2e84da47c0160ac4129c8cf8b2b64a
parenta26fb432caf1ddc2bfeb746a76a35cdf0a567251
Merge branch 'master' of athena.jabber.org:xmpp