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)
commit09c1e4a85e40514d1ac1e7c8665c3c17a624b736
treec94b22d224f7cae6cb7050b49c229cdbdf4cf3b2
parentdb343325356a73b6899e9580c6f5e32f33544003
parentafc65aa60aa7834ca09e7eca22a2f59a2f12a554
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpgme