Merge branch 'ben/docs/2018-03' of ssh+git://playfair.gnupg.org/git/gpgme into ben...
authorBen McGinnes <ben@adversary.org>
Wed, 21 Mar 2018 19:33:16 +0000 (06:33 +1100)
committerBen McGinnes <ben@adversary.org>
Wed, 21 Mar 2018 19:33:16 +0000 (06:33 +1100)

Trivial merge