Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Wed, 5 Dec 2018 14:53:08 +0000 (01:53 +1100)
committerBen McGinnes <ben@adversary.org>
Wed, 5 Dec 2018 14:53:08 +0000 (01:53 +1100)
commitad030234b4b50f1152731a17c54a53be2f2e0c25
treeed74ac05d1ce4ff28fd13ee8d02ee11686e93051
parentdc5600d306f808767068bad5117232fc3d35ac43
parent65c28da4e49a8778607fdcf6f51a840166616d9f
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme