Merge branch 'collectd-4.2'

author Florian Forster <octo@huhu.verplant.org>

Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)

committer Florian Forster <octo@huhu.verplant.org>

Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)
author Florian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)
committer Florian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/configfile.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)
committer	Florian Forster <octo@huhu.verplant.org>
	Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/configfile.c	patch \|	diff1 \|	diff2 \|	blob \| history