Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc
authorBen McGinnes <ben@adversary.org>
Fri, 29 Dec 2017 20:57:58 +0000 (07:57 +1100)
committerBen McGinnes <ben@adversary.org>
Fri, 29 Dec 2017 20:57:58 +0000 (07:57 +1100)

Trivial merge