Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Wed, 8 Jan 2014 18:40:48 +0000 (11:40 -0700)
committerPeter Saint-Andre <stpeter@stpeter.im>
Wed, 8 Jan 2014 18:40:48 +0000 (11:40 -0700)
commit0eed12f765d2f1ab232b79d13d9a6b1e4a8d48bb
tree372ab2dd4b8597ae18eb0ba6a354b952db756e73
parent513b22a984758f1d05448e7c95a78b15264b2475
parentf39ca454e7d42e4ae4bacb971ec72bc47ec801f0
Merge branch 'master' of athena.jabber.org:xmpp