Merge branch 'master' of athena.jabber.org:xmpp
authorPeter Saint-Andre <stpeter@stpeter.im>
Thu, 14 Nov 2013 18:41:54 +0000 (11:41 -0700)
committerPeter Saint-Andre <stpeter@stpeter.im>
Thu, 14 Nov 2013 18:41:54 +0000 (11:41 -0700)
commit9cbb87325541c9398ccc36ccfa6b596f77233973
tree3ca25bf59d262ec1ef4cc197265556529223c08f
parentb3f0ef8c94367529efb637bf61f608d476a2d9b2
parent80867eedbcfe3603d14cf260e0b431721b4949f6
Merge branch 'master' of athena.jabber.org:xmpp