Merge branch 'master' into preview
authorWerner Koch <wk@gnupg.org>
Thu, 4 May 2017 06:57:41 +0000 (08:57 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 4 May 2017 06:57:41 +0000 (08:57 +0200)
commit7322ee29adae530d80e8965fbca51e91e4728916
treed30b6c59c6ba04bc3105a096f4918c1e2828ea64
parentfc824d465626d1c504578b00b418b7cd24bb7113
parent5580a638b4f265e8d957289b59dc6656a33b9d50
Merge branch 'master' into preview