Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpg4win
authorWerner Koch <wk@gnupg.org>
Wed, 2 May 2012 15:34:35 +0000 (17:34 +0200)
committerWerner Koch <wk@gnupg.org>
Wed, 2 May 2012 15:34:35 +0000 (17:34 +0200)

Trivial merge