Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc
authorBen McGinnes <ben@adversary.org>
Sun, 25 Feb 2018 06:50:57 +0000 (17:50 +1100)
committerBen McGinnes <ben@adversary.org>
Sun, 25 Feb 2018 06:50:57 +0000 (17:50 +1100)

Trivial merge