Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Mon, 20 Nov 2017 13:54:44 +0000 (14:54 +0100)
committerWerner Koch <wk@gnupg.org>
Mon, 20 Nov 2017 13:54:54 +0000 (14:54 +0100)
1  2 
README
configure.ac
doc/Makefile.am

diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc doc/Makefile.am
Simple merge