Merge pull request #2512 from Stackdriver/pri

author Sebastian Harl <sh@tokkee.org>

Fri, 15 Dec 2017 13:10:08 +0000 (14:10 +0100)

committer GitHub <noreply@github.com>

Fri, 15 Dec 2017 13:10:08 +0000 (14:10 +0100)
author Sebastian Harl <sh@tokkee.org>
Fri, 15 Dec 2017 13:10:08 +0000 (14:10 +0100)
committer GitHub <noreply@github.com>
Fri, 15 Dec 2017 13:10:08 +0000 (14:10 +0100)
diff --cc src/email.c
Simple merge
diff --cc src/processes.c
Simple merge
author	Sebastian Harl <sh@tokkee.org>
	Fri, 15 Dec 2017 13:10:08 +0000 (14:10 +0100)
committer	GitHub <noreply@github.com>
	Fri, 15 Dec 2017 13:10:08 +0000 (14:10 +0100)
		1	2
src/email.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/processes.c	patch \|	diff1 \|	diff2 \|	blob \| history