Merge pull request #8508 from poettering/more-cocci

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Wed, 21 Mar 2018 11:50:49 +0000 (12:50 +0100)

committer GitHub <noreply@github.com>

Wed, 21 Mar 2018 11:50:49 +0000 (12:50 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 21 Mar 2018 11:50:49 +0000 (12:50 +0100)
committer GitHub <noreply@github.com>
Wed, 21 Mar 2018 11:50:49 +0000 (12:50 +0100)
diff --cc src/basic/calendarspec.c
Simple merge
diff --cc src/journal/journal-file.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 21 Mar 2018 11:50:49 +0000 (12:50 +0100)
committer	GitHub <noreply@github.com>
	Wed, 21 Mar 2018 11:50:49 +0000 (12:50 +0100)
		1	2
src/basic/calendarspec.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/journal/journal-file.c	patch \|	diff1 \|	diff2 \|	blob \| history