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)

Trivial merge