Merge pull request #500 from zonque/fileio

author Lennart Poettering <lennart@poettering.net>

Wed, 8 Jul 2015 20:13:53 +0000 (17:13 -0300)

committer Lennart Poettering <lennart@poettering.net>

Wed, 8 Jul 2015 20:13:53 +0000 (17:13 -0300)
author Lennart Poettering <lennart@poettering.net>
Wed, 8 Jul 2015 20:13:53 +0000 (17:13 -0300)
committer Lennart Poettering <lennart@poettering.net>
Wed, 8 Jul 2015 20:13:53 +0000 (17:13 -0300)
diff --cc src/login/logind-dbus.c
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 8 Jul 2015 20:13:53 +0000 (17:13 -0300)
committer	Lennart Poettering <lennart@poettering.net>
	Wed, 8 Jul 2015 20:13:53 +0000 (17:13 -0300)
		1	2
src/login/logind-dbus.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history