Merge branch 'master' into json-tool
authorWerner Koch <wk@gnupg.org>
Tue, 20 Mar 2018 10:13:14 +0000 (11:13 +0100)
committerWerner Koch <wk@gnupg.org>
Tue, 20 Mar 2018 10:13:14 +0000 (11:13 +0100)
commit44f9e80ea99733f373d75c3632273f763e6f5853
treeb3a504019e761a7624908058a0987eab01bf4505
parentd2b31d8c106423bd0eaa5fffaa39b0983c9ae525
parent343d3e2232a22d0999e1693f0f95e5e290005829
Merge branch 'master' into json-tool