Merge branch 'gpgme-1.9-branch'
authorWerner Koch <wk@gnupg.org>
Tue, 28 Mar 2017 14:49:42 +0000 (16:49 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 28 Mar 2017 14:49:42 +0000 (16:49 +0200)
--


Trivial merge