Merge pull request #4526 from keszybz/coredump-python

author Lennart Poettering <lennart@poettering.net>

Thu, 16 Feb 2017 10:24:03 +0000 (11:24 +0100)

committer GitHub <noreply@github.com>

Thu, 16 Feb 2017 10:24:03 +0000 (11:24 +0100)
author Lennart Poettering <lennart@poettering.net>
Thu, 16 Feb 2017 10:24:03 +0000 (11:24 +0100)
committer GitHub <noreply@github.com>
Thu, 16 Feb 2017 10:24:03 +0000 (11:24 +0100)
diff --cc src/core/job.c
Simple merge
diff --cc src/core/unit.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 16 Feb 2017 10:24:03 +0000 (11:24 +0100)
committer	GitHub <noreply@github.com>
	Thu, 16 Feb 2017 10:24:03 +0000 (11:24 +0100)
		1	2
src/core/job.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/unit.c	patch \|	diff1 \|	diff2 \|	blob \| history