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)
commiteaa6dc3a8b4f31525650cd4785d6bafab86d68b7
tree6552e846c825e2dae78d5ceefebee0e2acaeb27f
parent2739834206f23833161898a73427b8a9c6d5d26d
parentc4dbd1b2de8ae3847a040444e86500848868bcf4
Merge branch 'master' into key-storage-work

--
.gitignore
g10/getkey.c