Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc
authorBen McGinnes <ben@adversary.org>
Fri, 29 Dec 2017 20:57:58 +0000 (07:57 +1100)
committerBen McGinnes <ben@adversary.org>
Fri, 29 Dec 2017 20:57:58 +0000 (07:57 +1100)
commitba965893ef6c946c6be318f63f1f1b41e2eaeaaf
treee29bea2f930553f030f6a42f9ff6f153e7d98dac
parent8e51ad1b7ab043e5e83f743dc091d987d720af03
parent5c1e39ab92b3f8b0e331374d22bfaf2ecf7a194e
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gnupg-doc