Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg
authorWerner Koch <wk@gnupg.org>
Thu, 24 Nov 2011 15:16:43 +0000 (16:16 +0100)
committerWerner Koch <wk@gnupg.org>
Thu, 24 Nov 2011 15:16:43 +0000 (16:16 +0100)
commit0689f0fc32cc9a8e431d33ee3431d23f3fd1f258
treed04cff926996d2be6b1a58c3d696ab3f75fc97c6
parent231d27e0fec905be52d679961332947c3331f15f
parentd2a979452e541183cae7e6e04634b5bbdab9c9d7
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg