Merge branch 'STABLE-BRANCH-2-2'
authorWerner Koch <wk@gnupg.org>
Wed, 15 Nov 2017 10:01:10 +0000 (11:01 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 15 Nov 2017 10:01:10 +0000 (11:01 +0100)
--
Kept our AUTHORS and README

1  2 
doc/DETAILS
doc/Makefile.am
g10/getkey.c

diff --cc doc/DETAILS
Simple merge
diff --cc doc/Makefile.am
Simple merge
diff --cc g10/getkey.c
Simple merge