Merge branch 'ben/howto-update-02' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Wed, 28 Mar 2018 23:27:41 +0000 (10:27 +1100)
committerBen McGinnes <ben@adversary.org>
Wed, 28 Mar 2018 23:27:41 +0000 (10:27 +1100)
commit75a1a1c33efe952986bba56494b81e2f4835b8c4
tree579dc8e4920d3f989f6d1400269466e7e15c4fab
parent3345a17dda2222e3c1592235e8a1cd9493192777
parent3b91f6af378ccc37dcf8924cbc157894c35b5192
Merge branch 'ben/howto-update-02' of ssh+git://playfair.gnupg.org/git/gpgme