Mon, 13 Mar 2017 15:40:51 +0100merged from default ENGINE-188
Krista Grothoff <krista@pep-project.org> [Mon, 13 Mar 2017 15:40:51 +0100] rev 1651
merged from default

Mon, 13 Mar 2017 14:25:29 +0100Merged in default ENGINE-188
Krista Grothoff <krista@pep-project.org> [Mon, 13 Mar 2017 14:25:29 +0100] rev 1650
Merged in default

Mon, 13 Mar 2017 14:21:31 +0100merged in default ENGINE-174
Krista Grothoff <krista@pep-project.org> [Mon, 13 Mar 2017 14:21:31 +0100] rev 1649
merged in default

Mon, 13 Mar 2017 15:03:14 +0100merged
Edouard Tisserant <edouard@pep-project.org> [Mon, 13 Mar 2017 15:03:14 +0100] rev 1648
merged

Mon, 13 Mar 2017 14:33:17 +0100ENGINE-188 brutal fixes so that last mp_sync_test.py still completes. closing that branch ENGINE-188
Edouard Tisserant <edouard@pep-project.org> [Mon, 13 Mar 2017 14:33:17 +0100] rev 1647
ENGINE-188 brutal fixes so that last mp_sync_test.py still completes. closing that branch

Mon, 13 Mar 2017 09:52:14 +0100Closing branch ENGINE-172
Krista Grothoff <krista@pep-project.org> [Mon, 13 Mar 2017 09:52:14 +0100] rev 1646
Closing branch

Mon, 13 Mar 2017 09:51:53 +0100ENGINE 172 and ENGINE 180 merged into default. Additional flags now exist for encryption without signing and without attached keys, plus functionality - these are only to be used in strictly-predefined special cases
Krista Grothoff <krista@pep-project.org> [Mon, 13 Mar 2017 09:51:53 +0100] rev 1645
ENGINE 172 and ENGINE 180 merged into default. Additional flags now exist for encryption without signing and without attached keys, plus functionality - these are only to be used in strictly-predefined special cases

Mon, 13 Mar 2017 09:48:14 +0100ENGINE-172: ENGINE-180: tests check out. Modified MIME_decrypt_message to return decrypt status when MIME successful. ENGINE-172
Krista Grothoff <krista@pep-project.org> [Mon, 13 Mar 2017 09:48:14 +0100] rev 1644
ENGINE-172: ENGINE-180: tests check out. Modified MIME_decrypt_message to return decrypt status when MIME successful.

Mon, 13 Mar 2017 08:46:31 +0100Closing branch ENGINE-180
Krista Grothoff <krista@pep-project.org> [Mon, 13 Mar 2017 08:46:31 +0100] rev 1643
Closing branch

Mon, 13 Mar 2017 08:46:11 +0100ENGINE-172: ENGINE-180: no need for two separate branches here, and they were in the wrong order anyway, so merging ENGINE-172
Krista Grothoff <krista@pep-project.org> [Mon, 13 Mar 2017 08:46:11 +0100] rev 1642
ENGINE-172: ENGINE-180: no need for two separate branches here, and they were in the wrong order anyway, so merging