Merge branch 'website' of git+ssh://playfair.gnupg.org/git/gpg4win into website
authorEmanuel Schuetze <emanuel@intevation.de>
Thu, 21 Sep 2017 09:09:35 +0000 (11:09 +0200)
committerEmanuel Schuetze <emanuel@intevation.de>
Thu, 21 Sep 2017 09:09:35 +0000 (11:09 +0200)

Trivial merge