Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Fri, 27 Oct 2017 11:56:15 +0000 (13:56 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 27 Oct 2017 11:56:15 +0000 (13:56 +0200)
commitf6ab97fd9620bb8f512ffb471a66e5f96098a7cc
tree99db33d56ef4f0c05f1d6af6ec7ffaffd9547e1b
parentfb7828676cc2c01047498898378711e049f73fee
parent05cb87276c21c3a47226c75026fa46a955553dd9
Merge branch 'STABLE-BRANCH-2-2' into master

--
Resolved Conflicts:
configure.ac - Adjust due to new log_clock otions
configure.ac
g10/keygen.c
sm/gpgsm.c
sm/gpgsm.h