Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme into ben/docs/2018-03
authorBen McGinnes <ben@adversary.org>
Thu, 8 Mar 2018 22:31:44 +0000 (09:31 +1100)
committerBen McGinnes <ben@adversary.org>
Thu, 8 Mar 2018 22:31:44 +0000 (09:31 +1100)
commitf685cda281c6148072e8a6cd139c990cb041ea3d
tree005e213a4b73f58d1676a4d26f7c7efbad7efec7
parentfa4927146b68dd045903285f1c45fb64deb2e361
parente846c3daeeb4e7092169cdb7bf4f55e0b105aac3
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme into ben/docs/2018-03

* Fixed conflicts with TODO.
TODO