Merge pull request #9026 from yuwata/followup-9021

author Lennart Poettering <lennart@poettering.net>

Fri, 18 May 2018 18:02:43 +0000 (20:02 +0200)

committer GitHub <noreply@github.com>

Fri, 18 May 2018 18:02:43 +0000 (20:02 +0200)
author Lennart Poettering <lennart@poettering.net>
Fri, 18 May 2018 18:02:43 +0000 (20:02 +0200)
committer GitHub <noreply@github.com>
Fri, 18 May 2018 18:02:43 +0000 (20:02 +0200)
diff --cc src/core/dbus-execute.c
Simple merge
diff --cc src/core/load-fragment.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Fri, 18 May 2018 18:02:43 +0000 (20:02 +0200)
committer	GitHub <noreply@github.com>
	Fri, 18 May 2018 18:02:43 +0000 (20:02 +0200)
		1	2
src/core/dbus-execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/load-fragment.c	patch \|	diff1 \|	diff2 \|	blob \| history