Merge branch 'STABLE-BRANCH-2-2' into wk-master
authorWerner Koch <wk@gnupg.org>
Tue, 6 Mar 2018 15:26:26 +0000 (16:26 +0100)
committerWerner Koch <wk@gnupg.org>
Tue, 6 Mar 2018 15:26:26 +0000 (16:26 +0100)
commitf574aabeeb873f14a586f80cac16b857e6088534
treee84428513719a4e50cb1df1be509c12d34eb434a
parentf2c09203b98b83669a460dc8161283de96022536
parentf060cb5c63923d6caec784f65f3bb0aadf52f795
Merge branch 'STABLE-BRANCH-2-2' into wk-master
agent/agent.h
doc/gpgsm.texi
g10/call-agent.c
g10/card-util.c
tools/gpgconf-comp.c