Merge branch 'ben/howto-update-02' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Wed, 28 Mar 2018 23:27:41 +0000 (10:27 +1100)
committerBen McGinnes <ben@adversary.org>
Wed, 28 Mar 2018 23:27:41 +0000 (10:27 +1100)

Trivial merge