Merge branch 'pull/collectd-4' into collectd-4

author Florian Forster <octo@leeloo.lan.home.verplant.org>

Thu, 29 Mar 2007 17:22:11 +0000 (19:22 +0200)

committer Florian Forster <octo@leeloo.lan.home.verplant.org>

Thu, 29 Mar 2007 17:22:11 +0000 (19:22 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 29 Mar 2007 17:22:11 +0000 (19:22 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 29 Mar 2007 17:22:11 +0000 (19:22 +0200)
diff --cc src/csv.c
Simple merge
diff --cc src/unixsock.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Thu, 29 Mar 2007 17:22:11 +0000 (19:22 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Thu, 29 Mar 2007 17:22:11 +0000 (19:22 +0200)
		1	2
src/csv.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/unixsock.c	patch \|	diff1 \|	diff2 \|	blob \| history