Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Tue, 4 Dec 2018 21:49:41 +0000 (08:49 +1100)
committerBen McGinnes <ben@adversary.org>
Tue, 4 Dec 2018 21:49:41 +0000 (08:49 +1100)
commit8d2621fcad3ded2a4184c00a04ca1002b4de98cc
treec80dde4d38e975b58454046303c286b60f4556bf
parent8613727f1ee985c3cfa2c815523312914f033ffd
parent5dbac555f23bcec4adcfd82de61878f0f23ff272
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme