Merge branch 'no-xmpp'
authorJoey Hess <joeyh@joeyh.name>
Wed, 28 Dec 2016 16:26:16 +0000 (12:26 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 28 Dec 2016 16:26:16 +0000 (12:26 -0400)
commit93f7d114db2d759ea9e49db027cb17cca43998c5
tree7c0cd1cf314f434cca4f87a57456b4837cc348b5
parentb701247b06f8ce4a8a83e4d1fefb9dfa575e3db2
parent309742805f6fe6cc287918b3dcea7c5f2361db17
Merge branch 'no-xmpp'