Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg-doc
authorRobert J. Hansen <rjh@sixdemonbag.org>
Fri, 20 Oct 2017 00:52:27 +0000 (20:52 -0400)
committerRobert J. Hansen <rjh@sixdemonbag.org>
Fri, 20 Oct 2017 00:52:27 +0000 (20:52 -0400)

Trivial merge