Merge branch 'master' into key-storage-work key-storage-work
authorWerner Koch <wk@gnupg.org>
Wed, 20 Mar 2013 09:00:12 +0000 (10:00 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 20 Mar 2013 09:00:12 +0000 (10:00 +0100)
--

1  2 
.gitignore
g10/getkey.c

diff --cc .gitignore
@@@ -154,7 -154,6 +154,5 @@@ tools/mk-tdat
  tools/symcryptrun
  tools/watchgnupg
  tools/gpgtar
--
--
++private-keys-v1.d/
  x.parm
- private-keys-v1.d/
diff --cc g10/getkey.c
Simple merge