Merge pull request #1468 from poettering/fdnames

author Tom Gundersen <teg@jklm.no>

Tue, 6 Oct 2015 10:06:56 +0000 (12:06 +0200)

committer Tom Gundersen <teg@jklm.no>

Tue, 6 Oct 2015 10:06:56 +0000 (12:06 +0200)
author Tom Gundersen <teg@jklm.no>
Tue, 6 Oct 2015 10:06:56 +0000 (12:06 +0200)
committer Tom Gundersen <teg@jklm.no>
Tue, 6 Oct 2015 10:06:56 +0000 (12:06 +0200)
diff --cc src/basic/util.c
Simple merge
diff --cc src/core/service.c
Simple merge
author	Tom Gundersen <teg@jklm.no>
	Tue, 6 Oct 2015 10:06:56 +0000 (12:06 +0200)
committer	Tom Gundersen <teg@jklm.no>
	Tue, 6 Oct 2015 10:06:56 +0000 (12:06 +0200)
		1	2
src/basic/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/service.c	patch \|	diff1 \|	diff2 \|	blob \| history