Thu, 06 Oct 2016 11:52:55 +0200Merged default peg-mime
Krista Grothoff <krista@pep-project.org> [Thu, 06 Oct 2016 11:52:55 +0200] rev 1250
Merged default

Thu, 06 Oct 2016 10:56:30 +0200ENGINE-107: Merged with default ENGINE-107
Krista Grothoff <krista@pep-project.org> [Thu, 06 Oct 2016 10:56:30 +0200] rev 1249
ENGINE-107: Merged with default

Wed, 05 Oct 2016 18:18:41 +0200KEYSYNC: Added arbitrary hard coded sync message expiry (10m), and made special case when receiving groupKeys message so that they are not consumed giving a chance to other devices in the group to receive it as well.
Edouard Tisserant <edouard@pep-project.org> [Wed, 05 Oct 2016 18:18:41 +0200] rev 1248
KEYSYNC: Added arbitrary hard coded sync message expiry (10m), and made special case when receiving groupKeys message so that they are not consumed giving a chance to other devices in the group to receive it as well.

Wed, 05 Oct 2016 15:38:42 +0200KEYSYNC: #comment Merged keysync into default. Please commit to default, not keysync anymore, unless you are [~edouard]
Krista Grothoff <krista@pep-project.org> [Wed, 05 Oct 2016 15:38:42 +0200] rev 1247
KEYSYNC: #comment Merged keysync into default. Please commit to default, not keysync anymore, unless you are [~edouard]

Wed, 05 Oct 2016 15:31:49 +0200KEYSYNC: Closed branch keysync-windows keysync-windows
Krista Grothoff <krista@pep-project.org> [Wed, 05 Oct 2016 15:31:49 +0200] rev 1246
KEYSYNC: Closed branch keysync-windows

Wed, 05 Oct 2016 15:31:09 +0200KEYSYNC: Merged in branch keysync-windows keysync
Krista Grothoff <krista@pep-project.org> [Wed, 05 Oct 2016 15:31:09 +0200] rev 1245
KEYSYNC: Merged in branch keysync-windows

Wed, 05 Oct 2016 15:29:45 +0200KEYSYNC: Closed branch keysync-windows keysync
Krista Grothoff <krista@pep-project.org> [Wed, 05 Oct 2016 15:29:45 +0200] rev 1244
KEYSYNC: Closed branch keysync-windows

Wed, 05 Oct 2016 14:56:54 +0200ENGINE-107: added ct and rating states for having no key ENGINE-107
Krista Grothoff <krista@pep-project.org> [Wed, 05 Oct 2016 14:56:54 +0200] rev 1243
ENGINE-107: added ct and rating states for having no key

Tue, 04 Oct 2016 20:56:24 +0200Merge with keysync keysync-windows
Markus Schaber <markus@pep-security.net> [Tue, 04 Oct 2016 20:56:24 +0200] rev 1242
Merge with keysync

Wed, 28 Sep 2016 23:42:35 +0200merge "default" into "keysync" to keep them in sync keysync
Roker <roker@pep-project.org> [Wed, 28 Sep 2016 23:42:35 +0200] rev 1241
merge "default" into "keysync" to keep them in sync