Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpg4win
authorWerner Koch <wk@gnupg.org>
Mon, 26 Mar 2012 09:37:55 +0000 (11:37 +0200)
committerWerner Koch <wk@gnupg.org>
Mon, 26 Mar 2012 09:37:55 +0000 (11:37 +0200)

Trivial merge