Merge pull request #1937 from evverx/fix-stdout-parsing

author Lennart Poettering <lennart@poettering.net>

Fri, 27 Nov 2015 13:03:49 +0000 (14:03 +0100)

committer Lennart Poettering <lennart@poettering.net>

Fri, 27 Nov 2015 13:03:49 +0000 (14:03 +0100)
author Lennart Poettering <lennart@poettering.net>
Fri, 27 Nov 2015 13:03:49 +0000 (14:03 +0100)
committer Lennart Poettering <lennart@poettering.net>
Fri, 27 Nov 2015 13:03:49 +0000 (14:03 +0100)
diff --cc Makefile.am
Simple merge
diff --cc test/test-functions
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Fri, 27 Nov 2015 13:03:49 +0000 (14:03 +0100)
committer	Lennart Poettering <lennart@poettering.net>
	Fri, 27 Nov 2015 13:03:49 +0000 (14:03 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-functions	patch \|	diff1 \|	diff2 \|	blob \| history