[git] GPGME - branch, master, updated. gpgme-1.10.0-182-gfed024e

[by Ben McGinnes]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  fed024eff1091056647296ac589a0c88c2be41bb (commit)
       via  d0bb4ec4ecdfae4dfd9dd84aef905afb490013d5 (commit)
       via  e6180f2b36cc8a6c6154e5f3d702324af573132a (commit)
      from  60d7a1e8f625ea0db455bff989534dd52f0650c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fed024eff1091056647296ac589a0c88c2be41bb
Merge: d0bb4ec 60d7a1e
Author: Ben McGinnes <ben at adversary.org>
Date:   Fri Mar 30 10:38:31 2018 +1100

    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).

diff --cc lang/python/docs/GPGMEpythonHOWTOen.org
index 219f602,d51eb11..cb85b61
--- a/lang/python/docs/GPGMEpythonHOWTOen.org
+++ b/lang/python/docs/GPGMEpythonHOWTOen.org
@@@ -1251,8 -1287,8 +1287,8 @@@
     The =key_sign= method takes four arguments: =key=, =uids=,
     =expires_in= and =local=.  The default value of =uids= is =None=
     and which results in all user IDs being selected.  The default
-    values of =expires_in= and =local= is =False=; which results in the
 -   values of =expires_in= and =local= is =False=; which result in the
--   signature never expiring and being able to be exported.
++   value of both =expires_in= and =local= is =False=; which results in
++   the signature never expiring and being able to be exported.
  
     The =key= is the key being signed rather than the key doing the
     signing.  To change the key doing the signing refer to the signing

commit d0bb4ec4ecdfae4dfd9dd84aef905afb490013d5
Merge: e6180f2 4763974
Author: Ben McGinnes <ben at adversary.org>
Date:   Sun Mar 25 09:44:51 2018 +1100

    Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme


commit e6180f2b36cc8a6c6154e5f3d702324af573132a
Author: Ben McGinnes <ben at adversary.org>
Date:   Sat Mar 24 06:41:36 2018 +1100

    doc: python bindings howto
    
    * Fixed a minor spelling error and a minor grammatical error.

diff --git a/lang/python/docs/GPGMEpythonHOWTOen.org b/lang/python/docs/GPGMEpythonHOWTOen.org
index 1e8dd9f..219f602 100644
--- a/lang/python/docs/GPGMEpythonHOWTOen.org
+++ b/lang/python/docs/GPGMEpythonHOWTOen.org
@@ -1251,7 +1251,7 @@
    The =key_sign= method takes four arguments: =key=, =uids=,
    =expires_in= and =local=.  The default value of =uids= is =None=
    and which results in all user IDs being selected.  The default
-   values of =expires_in= snd =local= is =False=; which result in the
+   values of =expires_in= and =local= is =False=; which results in the
    signature never expiring and being able to be exported.
 
    The =key= is the key being signed rather than the key doing the

-----------------------------------------------------------------------

Summary of changes:
 lang/python/docs/GPGMEpythonHOWTOen.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org