Merge branch 'master' into LIBGCRYPT-1-7-BRANCH
authorWerner Koch <wk@gnupg.org>
Wed, 15 Jun 2016 07:24:02 +0000 (09:24 +0200)
committerWerner Koch <wk@gnupg.org>
Wed, 15 Jun 2016 07:24:02 +0000 (09:24 +0200)
--


Trivial merge