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)
commita843a6d2e631466e4501ff6a428574da3c34f0df
treea36423f34a242d7ed2c90b6c1a06d198e648a9e7
parent58956bd85100ac00495f5d36128914139fab2903
parent0dd65a16bb36531585470c2062f2d144a5c546e0
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpg4win