Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Tue, 28 Aug 2018 18:16:37 +0000 (04:16 +1000)
committerBen McGinnes <ben@adversary.org>
Tue, 28 Aug 2018 18:16:37 +0000 (04:16 +1000)
commit16e566f319004d49f55197238380cc4c03e01f48
tree86203a625d199142b975c3cce97b15465d165026
parent02d0b97bfedc732351cc4e89c92fcd9d31209535
parent3bdf8be6d2c57319399fe14e27e52b323a17750a
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme