Merge branch 'master' into STABLE-BRANCH-2-2
authorWerner Koch <wk@gnupg.org>
Wed, 13 Jul 2016 13:11:46 +0000 (15:11 +0200)
committerWerner Koch <wk@gnupg.org>
Wed, 13 Jul 2016 13:11:46 +0000 (15:11 +0200)
commit4ef62278e3c9406360dc50288f422291497e218f
treefff3a49be5c2659ab87195e5b0a4f88e51a49205
parenteae301bf9c24fd17599c005ed3415450d6dce7e3
parente148c3caa90fbadba32bdbfea9513392e3aea598
Merge branch 'master' into STABLE-BRANCH-2-2

--