Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg
authorWerner Koch <wk@gnupg.org>
Fri, 20 May 2011 08:30:36 +0000 (10:30 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 20 May 2011 08:30:36 +0000 (10:30 +0200)
commit79d59e8c0969c199b63ef8083bed400af4082b63
tree100fb4c524866d41bbd680759130d5ba0cb3d931
parentd679b4d642170ab131ee086ac1d0951958850f33
parentde7cfc0c9b452d5e42346b2e598d44626b166865
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg