Merge branch 'master' into LIBGCRYPT-1-7-BRANCH
authorWerner Koch <wk@gnupg.org>
Thu, 14 Jul 2016 09:19:22 +0000 (11:19 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 14 Jul 2016 09:19:22 +0000 (11:19 +0200)

Trivial merge