Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg-doc
authorRobert J. Hansen <rjh@sixdemonbag.org>
Tue, 10 Oct 2017 15:30:09 +0000 (11:30 -0400)
committerRobert J. Hansen <rjh@sixdemonbag.org>
Tue, 10 Oct 2017 15:30:09 +0000 (11:30 -0400)
1  2 
web/faq/gnupg-faq.org

Simple merge