Merge branch 'master' into STABLE-BRANCH-2-2
authorWerner Koch <wk@gnupg.org>
Thu, 14 Jul 2016 13:58:56 +0000 (15:58 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 14 Jul 2016 13:58:56 +0000 (15:58 +0200)
commitbe1e4560d5afb99a6a7b7c639cce980006530a9e
tree0ba98e2dbc56153cb5f6e1c50b2adc259965a40e
parent4ef62278e3c9406360dc50288f422291497e218f
parent2b96661f6db9e57e44a11f3353968c198f4c217e
Merge branch 'master' into STABLE-BRANCH-2-2