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)
commit091c4af64543cf95d92e09664b5eb1b729782064
tree1abe5f5a75a39852e5e78f17efed1d4f86426afe
parentd4e2302d8f4a1ff52d56da4f8e3a5d1c6303822d
parent1b6d1ac97638ebc5b5ce7d863b166e9b7669bf2f
Merge branch 'STABLE-BRANCH-2-2'

--
Kept our AUTHORS and README
doc/DETAILS
doc/Makefile.am
g10/getkey.c