Merge branch 'master' of /Users/ben/dev/hgit/mine/gnupg/gpgme/master into ben/python...
authorBen McGinnes <ben@adversary.org>
Thu, 15 Feb 2018 15:04:57 +0000 (02:04 +1100)
committerBen McGinnes <ben@adversary.org>
Thu, 15 Feb 2018 15:04:57 +0000 (02:04 +1100)
commit2b092bf235160e04c10480c47c0fd6dce4e770c4
treef171ad3b31f66a0fbc480be4286c8e7dc9a3ce99
parent6f15d821404742ac2683f54ca4102ee4aaedacf2
parent3224d7f0ea83a3c2baaa9f97846c4a5b392d2c59
Merge branch 'master' of /Users/ben/dev/hgit/mine/gnupg/gpgme/master into ben/python-docs-01