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)
1  2 
g10/gpg.c
g10/keydb.h
g10/options.h
g10/pubkey-enc.c

diff --cc g10/gpg.c
Simple merge
diff --cc g10/keydb.h
Simple merge
diff --cc g10/options.h
Simple merge
Simple merge