Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg
authorWerner Koch <wk@gnupg.org>
Thu, 16 Jun 2016 16:44:05 +0000 (18:44 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 16 Jun 2016 16:44:05 +0000 (18:44 +0200)

Trivial merge