Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Sat, 24 Mar 2018 22:44:51 +0000 (09:44 +1100)
committerBen McGinnes <ben@adversary.org>
Sat, 24 Mar 2018 22:44:51 +0000 (09:44 +1100)

Trivial merge