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)
commit2691758e1bf56e103f4b28587f17e99203069124
tree1149a5d3bfd80090cb9dcccb30d1c29025869dd8
parentf923342634509dd9076709673b8d1bf56c911cb7
parent4bb81e5ae79457ced41a5f2b467fafcf4eebde3d
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg-doc