Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg-doc
authorRobert J. Hansen <rjh@sixdemonbag.org>
Sun, 12 Nov 2017 07:56:48 +0000 (02:56 -0500)
committerRobert J. Hansen <rjh@sixdemonbag.org>
Sun, 12 Nov 2017 07:56:48 +0000 (02:56 -0500)

Trivial merge