Merge branch 'ben/docs/2018-03' of ssh+git://playfair.gnupg.org/git/gpgme into ben...
authorBen McGinnes <ben@adversary.org>
Wed, 21 Mar 2018 19:33:16 +0000 (06:33 +1100)
committerBen McGinnes <ben@adversary.org>
Wed, 21 Mar 2018 19:33:16 +0000 (06:33 +1100)
commit76055dd5c7d755c6f8a242b701aeadba621fbc0f
treeb995196bcadcfa0485429d753397f61317b17292
parent343d3e2232a22d0999e1693f0f95e5e290005829
parent05e59933056ee8ef8ba7579351a58ed25dd7f754
Merge branch 'ben/docs/2018-03' of ssh+git://playfair.gnupg.org/git/gpgme into ben/docs/2018-03