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)

Trivial merge