Merge branch 't/logfile_only_for_daemon'

author Andre Noll <maan@systemlinux.org>

Mon, 7 Feb 2011 16:56:36 +0000 (17:56 +0100)

committer Andre Noll <maan@systemlinux.org>

Mon, 7 Feb 2011 16:56:36 +0000 (17:56 +0100)
author Andre Noll <maan@systemlinux.org>
Mon, 7 Feb 2011 16:56:36 +0000 (17:56 +0100)
committer Andre Noll <maan@systemlinux.org>
Mon, 7 Feb 2011 16:56:36 +0000 (17:56 +0100)
diff --cc dss.c
Simple merge
diff --cc dss.ggo
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Mon, 7 Feb 2011 16:56:36 +0000 (17:56 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Mon, 7 Feb 2011 16:56:36 +0000 (17:56 +0100)
		1	2
dss.c	patch \|	diff1 \|	diff2 \|	blob \| history
dss.ggo	patch \|	diff1 \|	diff2 \|	blob \| history