Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpgme
authorJustus Winter <justus@gnupg.org>
Tue, 17 May 2016 13:13:46 +0000 (15:13 +0200)
committerJustus Winter <justus@gnupg.org>
Tue, 17 May 2016 13:13:46 +0000 (15:13 +0200)

Trivial merge