Merge branch 't/logfile_only_for_daemon'
authorAndre Noll <maan@systemlinux.org>
Mon, 7 Feb 2011 16:56:36 +0000 (17:56 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 7 Feb 2011 16:56:36 +0000 (17:56 +0100)
1  2 
dss.c
dss.ggo

diff --cc dss.c
Simple merge
diff --cc dss.ggo
Simple merge