Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc
authorBen McGinnes <ben@adversary.org>
Thu, 22 Mar 2018 00:26:28 +0000 (11:26 +1100)
committerBen McGinnes <ben@adversary.org>
Thu, 22 Mar 2018 00:26:28 +0000 (11:26 +1100)

Trivial merge