Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Tue, 4 Dec 2018 21:49:41 +0000 (08:49 +1100)
committerBen McGinnes <ben@adversary.org>
Tue, 4 Dec 2018 21:49:41 +0000 (08:49 +1100)

Trivial merge