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)
commit679c90e1c28c450d58a1d11ef82d9373346cd476
tree2f87751217dc964d3d7193c187bb30e74b71c254
parent52c0de52ff1588aa1c25a501f1af6a86d03e7211
parente2d6928a96636adfdd08e49be0e57bf9a5dd6514
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg-doc