Merge branch 'master' into ECC-INTEGRATION-2-1
authorWerner Koch <wk@gnupg.org>
Mon, 24 Jan 2011 11:24:11 +0000 (12:24 +0100)
committerWerner Koch <wk@gnupg.org>
Mon, 24 Jan 2011 11:24:11 +0000 (12:24 +0100)
commitc5e8a4c0fdde7f4aef2163a3710483c87bdf3161
treeae9da511231485f5c8ba8faeb3e7db3b971fe8ff
parentb3adbb576e88a12ee9e7ea790a72ad5f1bff4c78
parent62842cc7fe614e278638c008d0192d68a05a555a
Merge branch 'master' into ECC-INTEGRATION-2-1
ChangeLog
agent/ChangeLog
common/ChangeLog
common/util.h
configure.ac
dirmngr/Makefile.am
g10/ChangeLog
g10/Makefile.am
g10/export.c
g10/gpg.c
g10/main.h