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)
1  2 
agent/agent.h
doc/gpgsm.texi
g10/call-agent.c
g10/card-util.c
tools/gpgconf-comp.c

diff --cc agent/agent.h
Simple merge
diff --cc doc/gpgsm.texi
Simple merge
Simple merge
diff --cc g10/card-util.c
Simple merge
Simple merge