Merge branch 'json-tool'
authorWerner Koch <wk@gnupg.org>
Fri, 23 Mar 2018 10:31:20 +0000 (11:31 +0100)
committerWerner Koch <wk@gnupg.org>
Fri, 23 Mar 2018 10:31:20 +0000 (11:31 +0100)
commitc7bb12da5297a7e188766d9759f700dd771faff8
tree28252df6c635c446d992e624e298aeb83b7d688a
parent65ed4ac82598734551b87fc89deab3cee010bd37
parentd83482a1d768fc5afd3aa4836f2fefe5c549d02e
Merge branch 'json-tool'