Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Tue, 28 Aug 2018 18:16:37 +0000 (04:16 +1000)
committerBen McGinnes <ben@adversary.org>
Tue, 28 Aug 2018 18:16:37 +0000 (04:16 +1000)

Trivial merge