Merge branch 'website-3-dev' of ssh://playfair.gnupg.org/git/gpg4win into website...
-rw-r--r-- 3448 .gitignore
-rw-r--r-- 2411 README
drwxr-xr-x - web