Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpg4win
authorEmanuel Schuetze <emanuel@intevation.de>
Fri, 4 May 2012 07:25:56 +0000 (09:25 +0200)
committerEmanuel Schuetze <emanuel@intevation.de>
Fri, 4 May 2012 07:25:56 +0000 (09:25 +0200)

Trivial merge