Merge branch 'website-3-dev' of ssh://playfair.gnupg.org/git/gpg4win into website...
authorJochen Saalfeld <privat@jochen-saalfeld.de>
Wed, 20 Sep 2017 11:18:06 +0000 (13:18 +0200)
committerJochen Saalfeld <privat@jochen-saalfeld.de>
Wed, 20 Sep 2017 11:18:06 +0000 (13:18 +0200)

Trivial merge