Merge branch 'master' into keyserver-via-dirmngr
authorWerner Koch <wk@gnupg.org>
Thu, 20 Jan 2011 13:21:46 +0000 (14:21 +0100)
committerWerner Koch <wk@gnupg.org>
Thu, 20 Jan 2011 13:21:46 +0000 (14:21 +0100)
commit49d25d3185636237b356781cdde7960f234f2d11
tree3558e3a7ba9aec79e9ace48348f775a23635d208
parent7f32d88ed1b81719e0cda11710fc66745deee6e2
parent13acd78a39750e3990684a5bb0951fe0db83fc5a
Merge branch 'master' into keyserver-via-dirmngr
common/ChangeLog
dirmngr/ChangeLog