Merge pull request #3764 from poettering/assorted-stuff-2

author Martin Pitt <martin.pitt@ubuntu.com>

Fri, 22 Jul 2016 07:10:04 +0000 (09:10 +0200)

committer GitHub <noreply@github.com>

Fri, 22 Jul 2016 07:10:04 +0000 (09:10 +0200)
author Martin Pitt <martin.pitt@ubuntu.com>
Fri, 22 Jul 2016 07:10:04 +0000 (09:10 +0200)
committer GitHub <noreply@github.com>
Fri, 22 Jul 2016 07:10:04 +0000 (09:10 +0200)
diff --cc src/core/namespace.c
Simple merge
diff --cc units/systemd-nspawn@.service.in
Simple merge
author	Martin Pitt <martin.pitt@ubuntu.com>
	Fri, 22 Jul 2016 07:10:04 +0000 (09:10 +0200)
committer	GitHub <noreply@github.com>
	Fri, 22 Jul 2016 07:10:04 +0000 (09:10 +0200)
		1	2
src/core/namespace.c	patch \|	diff1 \|	diff2 \|	blob \| history
units/systemd-nspawn@.service.in	patch \|	diff1 \|	diff2 \|	blob \| history