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)
commitc5d2f52c0c19fcf0100f50de617e17fdd1fac9a4
treef29111d1d99f3819ac2e1eacbc6772a14a132a1f
parente938699f0f336ffca0b39df2428db2fdc2b37eb9
parent26d094f507783e2379d3cdb6942a403f0dc7a7a8
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpg4win