Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Wed, 5 Dec 2018 14:53:08 +0000 (01:53 +1100)
committerBen McGinnes <ben@adversary.org>
Wed, 5 Dec 2018 14:53:08 +0000 (01:53 +1100)

Trivial merge