Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc
authorBen McGinnes <ben@adversary.org>
Sun, 25 Feb 2018 06:50:57 +0000 (17:50 +1100)
committerBen McGinnes <ben@adversary.org>
Sun, 25 Feb 2018 06:50:57 +0000 (17:50 +1100)
commitda754fde9eb98da8ef28b33315f50057f5540785
treed187984899f0cfb80e3d4918909bef266f219cea
parentb276fa44402fa3e80bfc5b65229cd2a219f5195a
parent94c69b9eee9d51c2e8c36b3ac9c16a113055c682
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc