Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
authorBen McGinnes <ben@adversary.org>
Thu, 29 Mar 2018 23:38:31 +0000 (10:38 +1100)
committerBen McGinnes <ben@adversary.org>
Thu, 29 Mar 2018 23:38:31 +0000 (10:38 +1100)
commitfed024eff1091056647296ac589a0c88c2be41bb
tree92107918246e3e9f9660ee06d9668868fed473ca
parentd0bb4ec4ecdfae4dfd9dd84aef905afb490013d5
parent60d7a1e8f625ea0db455bff989534dd52f0650c7
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme

* Also fixed a small grammatical error highlighted by a merge conflict
  (in the python bindings howto).
lang/python/docs/GPGMEpythonHOWTOen.org