Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Sat, 24 Mar 2018 22:44:51 +0000 (09:44 +1100)
committerBen McGinnes <ben@adversary.org>
Sat, 24 Mar 2018 22:44:51 +0000 (09:44 +1100)
commitd0bb4ec4ecdfae4dfd9dd84aef905afb490013d5
treee9d1a21501e4d09bd0442e9eee829046b25a922d
parente6180f2b36cc8a6c6154e5f3d702324af573132a
parent4763974ef6932c503e35c3d14fe47a66a5323f48
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme