Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc
authorBen McGinnes <ben@adversary.org>
Thu, 22 Mar 2018 00:26:28 +0000 (11:26 +1100)
committerBen McGinnes <ben@adversary.org>
Thu, 22 Mar 2018 00:26:28 +0000 (11:26 +1100)
commit8cf29941c754d386f1d81fc4a52450cd2a9e0f7b
tree5d341ccef9e27fe1fdaa3a4f3f1d66094c6c1b1d
parent89ca96b83eadb31171b750a3bfd31da009a20db4
parent8aaa4d783f38be7ad5d72df0451a8208b0712dbd
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc