Merge pull request #12137 from poettering/socket-var-run

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

Fri, 29 Mar 2019 14:00:25 +0000 (15:00 +0100)

committer GitHub <noreply@github.com>

Fri, 29 Mar 2019 14:00:25 +0000 (15:00 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 29 Mar 2019 14:00:25 +0000 (15:00 +0100)
committer GitHub <noreply@github.com>
Fri, 29 Mar 2019 14:00:25 +0000 (15:00 +0100)
diff --cc TODO
Simple merge
diff --cc src/core/load-fragment.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 29 Mar 2019 14:00:25 +0000 (15:00 +0100)
committer	GitHub <noreply@github.com>
	Fri, 29 Mar 2019 14:00:25 +0000 (15:00 +0100)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/load-fragment.c	patch \|	diff1 \|	diff2 \|	blob \| history