Merge branch 'master' into key-storage-work
authorWerner Koch <wk@gnupg.org>
Tue, 12 Feb 2013 18:17:42 +0000 (19:17 +0100)
committerWerner Koch <wk@gnupg.org>
Tue, 12 Feb 2013 18:17:42 +0000 (19:17 +0100)
commitcaddeef4a7ffe5f2eb6453d364b6ae152e0f6625
tree5894e3f0e365b0c9035efecea2bbd5ad3042ca51
parentb11f84b858bad867f1062977a7aba30299157e90
parentb90506ea220860c89128f002bd593d0462a08d73
Merge branch 'master' into key-storage-work
g10/gpg.c
g10/keydb.h
g10/options.h
g10/pubkey-enc.c