Merge branch 'seckey-sync-work' into master
authorWerner Koch <wk@gnupg.org>
Wed, 14 Nov 2018 12:37:41 +0000 (13:37 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 14 Nov 2018 12:37:41 +0000 (13:37 +0100)
--

1  2 
configure.ac
tools/Makefile.am

diff --cc configure.ac
Simple merge
Simple merge