Merge branch 'website' of git+ssh://playfair.gnupg.org/git/gpg4win into website
authorBernhard Reiter <bernhard@intevation.de>
Mon, 9 Oct 2017 09:02:43 +0000 (11:02 +0200)
committerBernhard Reiter <bernhard@intevation.de>
Mon, 9 Oct 2017 09:02:43 +0000 (11:02 +0200)
commita5e10bc037c40d6333aef0f570eec02a21f7ae3e
treec5d143e4bea5eaff4df4607183a7a844238bd6f9
parent5f70a25ebf20d9cbcd83e311744e7b1a42cf2976
parent752cc7e5b1b30298ab61d43704b442a52494ceba
Merge branch 'website' of git+ssh://playfair.gnupg.org/git/gpg4win into website