Merge branch 'website-3-dev' of git+ssh://playfair.gnupg.org/git/gpg4win into website...
authorEmanuel Schuetze <emanuel@intevation.de>
Wed, 20 Sep 2017 09:04:19 +0000 (11:04 +0200)
committerEmanuel Schuetze <emanuel@intevation.de>
Wed, 20 Sep 2017 09:04:19 +0000 (11:04 +0200)

Trivial merge