Merge branch 'STABLE-BRANCH-2-2'
authorWerner Koch <wk@gnupg.org>
Thu, 23 Nov 2017 14:12:45 +0000 (15:12 +0100)
committerWerner Koch <wk@gnupg.org>
Thu, 23 Nov 2017 14:12:45 +0000 (15:12 +0100)
--

Signed-off-by: Werner Koch <wk@gnupg.org>
1  2 
scd/apdu.c

diff --cc scd/apdu.c
Simple merge