Merge pull request #4795 from poettering/dissect

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

Sat, 10 Dec 2016 06:08:13 +0000 (01:08 -0500)

committer GitHub <noreply@github.com>

Sat, 10 Dec 2016 06:08:13 +0000 (01:08 -0500)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 10 Dec 2016 06:08:13 +0000 (01:08 -0500)
committer GitHub <noreply@github.com>
Sat, 10 Dec 2016 06:08:13 +0000 (01:08 -0500)
diff --cc .gitignore
Simple merge
diff --cc Makefile.am
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Sat, 10 Dec 2016 06:08:13 +0000 (01:08 -0500)
committer	GitHub <noreply@github.com>
	Sat, 10 Dec 2016 06:08:13 +0000 (01:08 -0500)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history