Sat, 23 Sep 2017 16:23:05 +0200Merged in default via ENGINE-214 ENGINE-262
Krista Bennett <krista@pep-project.org> [Sat, 23 Sep 2017 16:23:05 +0200] rev 2095
Merged in default via ENGINE-214

Sat, 23 Sep 2017 16:22:42 +0200merged in default ENGINE-214
Krista Bennett <krista@pep-project.org> [Sat, 23 Sep 2017 16:22:42 +0200] rev 2094
merged in default

Sat, 23 Sep 2017 16:21:49 +0200ENGINE-262: another intermittent commit ENGINE-262
Krista Bennett <krista@pep-project.org> [Sat, 23 Sep 2017 16:21:49 +0200] rev 2093
ENGINE-262: another intermittent commit

Thu, 21 Sep 2017 22:42:24 +0200ENGINE-262: decrypt_message cleanup ongoing (intermittent commit - probably doesn't compile) ENGINE-262
Krista Bennett <krista@pep-project.org> [Thu, 21 Sep 2017 22:42:24 +0200] rev 2092
ENGINE-262: decrypt_message cleanup ongoing (intermittent commit - probably doesn't compile)

Thu, 21 Sep 2017 18:37:20 +0200Merged latest default in test_diphoton test_diphoton
Edouard Tisserant <edouard@pep-project.org> [Thu, 21 Sep 2017 18:37:20 +0200] rev 2091
Merged latest default in test_diphoton

Thu, 21 Sep 2017 18:36:48 +0200Fixed pgp_gpg.c search key crashing with NULL pattern. Sequel of recent ENGINE-255 changes.
Edouard Tisserant <edouard@pep-project.org> [Thu, 21 Sep 2017 18:36:48 +0200] rev 2090
Fixed pgp_gpg.c search key crashing with NULL pattern. Sequel of recent ENGINE-255 changes.

Thu, 21 Sep 2017 17:03:26 +0200Merged latest default in test_diphoton. Only one conflict about NOLOG. test_diphoton branches enforces logging, even if not debug build test_diphoton
Edouard Tisserant <edouard@pep-project.org> [Thu, 21 Sep 2017 17:03:26 +0200] rev 2089
Merged latest default in test_diphoton. Only one conflict about NOLOG. test_diphoton branches enforces logging, even if not debug build

Thu, 21 Sep 2017 16:42:50 +0200Merge ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Thu, 21 Sep 2017 16:42:50 +0200] rev 2088
Merge ENGINE-261

Thu, 21 Sep 2017 15:46:18 +0200Change BUILD_CONF to BUILD_CONFIG ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Thu, 21 Sep 2017 15:46:18 +0200] rev 2087
Change BUILD_CONF to BUILD_CONFIG

Thu, 21 Sep 2017 15:44:55 +0200Fix incorrect variable use ENGINE-261
Damiano Boppart <damiano@pep-security.net> [Thu, 21 Sep 2017 15:44:55 +0200] rev 2086
Fix incorrect variable use