Merge branch 'website' of ssh://playfair.gnupg.org/git/gpg4win into website
authorJochen Saalfeld <privat@jochen-saalfeld.de>
Thu, 21 Sep 2017 09:27:51 +0000 (11:27 +0200)
committerJochen Saalfeld <privat@jochen-saalfeld.de>
Thu, 21 Sep 2017 09:27:51 +0000 (11:27 +0200)

Trivial merge