Thu, 11 Aug 2016 12:39:51 +0200avoiding name clash with Python keysync
Volker Birk <vb@pep.foundation> [Thu, 11 Aug 2016 12:39:51 +0200] rev 1003
avoiding name clash with Python

Thu, 11 Aug 2016 11:53:00 +0200session->own_key_retrieve -> session->own_identities_retrieve keysync
Roker <roker@pep-project.org> [Thu, 11 Aug 2016 11:53:00 +0200] rev 1002
session->own_key_retrieve -> session->own_identities_retrieve

Wed, 10 Aug 2016 16:17:11 +0200merge "default" branch into "keysync" branch and resolve 2 minor merge conflicts. keysync
Roker <roker@pep-project.org> [Wed, 10 Aug 2016 16:17:11 +0200] rev 1001
merge "default" branch into "keysync" branch and resolve 2 minor merge conflicts.

Wed, 10 Aug 2016 16:13:43 +0200merge default into my branch roker-linux
Roker <roker@pep-project.org> [Wed, 10 Aug 2016 16:13:43 +0200] rev 1000
merge default into my branch

Wed, 10 Aug 2016 16:02:01 +0200Clumsy closing of feature branch ENGINE-40 and subsequent merge.
Krista Grothoff <krista@pep-project.org> [Wed, 10 Aug 2016 16:02:01 +0200] rev 999
Clumsy closing of feature branch ENGINE-40 and subsequent merge.

Wed, 10 Aug 2016 16:01:20 +0200Closed feature branch ENGINE-40. Clumsily. ENGINE-40
Krista Grothoff <krista@pep-project.org> [Wed, 10 Aug 2016 16:01:20 +0200] rev 998
Closed feature branch ENGINE-40. Clumsily.

Wed, 10 Aug 2016 15:56:16 +0200Merging ENGINE-40 feature impl w/ default
Krista Grothoff <krista@pep-project.org> [Wed, 10 Aug 2016 15:56:16 +0200] rev 997
Merging ENGINE-40 feature impl w/ default

Wed, 10 Aug 2016 15:55:20 +0200Merging ENGINE-40 feature impl w/ default ENGINE-40
Krista Grothoff <krista@pep-project.org> [Wed, 10 Aug 2016 15:55:20 +0200] rev 996
Merging ENGINE-40 feature impl w/ default

Wed, 10 Aug 2016 15:53:55 +0200ENGINE-40 #comment Implemented encrypt_message_for_self() to be used in draft-saving, etc. Will comment in bug on usage (or see message_api.h) ENGINE-40
Krista Grothoff <krista@pep-project.org> [Wed, 10 Aug 2016 15:53:55 +0200] rev 995
ENGINE-40 #comment Implemented encrypt_message_for_self() to be used in draft-saving, etc. Will comment in bug on usage (or see message_api.h)

Wed, 10 Aug 2016 12:53:40 +0200intermittent commit to stow changes ENGINE-40
Krista Grothoff <krista@pep-project.org> [Wed, 10 Aug 2016 12:53:40 +0200] rev 994
intermittent commit to stow changes