Tue, 09 May 2017 14:14:00 +0200Reclosing ENGINE-199, hanging head in shame for working on wrong branch... ENGINE-199
Krista Bennett <krista@pep-project.org> [Tue, 09 May 2017 14:14:00 +0200] rev 1771
Reclosing ENGINE-199, hanging head in shame for working on wrong branch...

Tue, 09 May 2017 14:13:23 +0200Merging in ENGINE-199 to get changes for ENGINE-198 because I am a doofus.
Krista Bennett <krista@pep-project.org> [Tue, 09 May 2017 14:13:23 +0200] rev 1770
Merging in ENGINE-199 to get changes for ENGINE-198 because I am a doofus.

Tue, 09 May 2017 14:12:14 +0200Merging in default. Committed to wrong branch. Sorry Lars - will reclose once merged to default ;) ENGINE-199
Krista Bennett <krista@pep-project.org> [Tue, 09 May 2017 14:12:14 +0200] rev 1769
Merging in default. Committed to wrong branch. Sorry Lars - will reclose once merged to default ;)

Tue, 09 May 2017 14:10:52 +0200ENGINE-198: ensure return of MIME message even when decryption fails ENGINE-199
Krista Bennett <krista@pep-project.org> [Tue, 09 May 2017 14:10:52 +0200] rev 1768
ENGINE-198: ensure return of MIME message even when decryption fails

Tue, 09 May 2017 14:00:24 +0200merge "ENGINE-199" into "default" branch
Roker <roker@pep-project.org> [Tue, 09 May 2017 14:00:24 +0200] rev 1767
merge "ENGINE-199" into "default" branch

Tue, 09 May 2017 14:00:02 +0200close branch before merge ENGINE-199
Roker <roker@pep-project.org> [Tue, 09 May 2017 14:00:02 +0200] rev 1766
close branch before merge

Tue, 09 May 2017 09:49:09 +0200fix b0rken merge. *sigh* ENGINE-199
Roker <roker@pep-project.org> [Tue, 09 May 2017 09:49:09 +0200] rev 1765
fix b0rken merge. *sigh*

Tue, 09 May 2017 09:31:15 +0200merge "default" into my branch ENGINE-199
Roker <roker@pep-project.org> [Tue, 09 May 2017 09:31:15 +0200] rev 1764
merge "default" into my branch

Mon, 08 May 2017 22:09:00 +0200Merged
Edouard Tisserant <edouard@pep-project.org> [Mon, 08 May 2017 22:09:00 +0200] rev 1763
Merged

Mon, 08 May 2017 18:17:13 +0200ENGINE-183 merged
Edouard Tisserant <edouard@pep-project.org> [Mon, 08 May 2017 18:17:13 +0200] rev 1762
ENGINE-183 merged