Merge branch 'collectd-4.10' into collectd-5.0

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

Mon, 14 Mar 2011 19:08:24 +0000 (20:08 +0100)

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

Mon, 14 Mar 2011 19:08:24 +0000 (20:08 +0100)
author Florian Forster <octo@huhu.verplant.org>
Mon, 14 Mar 2011 19:08:24 +0000 (20:08 +0100)
committer Florian Forster <octo@huhu.verplant.org>
Mon, 14 Mar 2011 19:08:24 +0000 (20:08 +0100)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/plugin.c
Simple merge
diff --cc src/processes.c
Simple merge
diff --cc src/python.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Mon, 14 Mar 2011 19:08:24 +0000 (20:08 +0100)
committer	Florian Forster <octo@huhu.verplant.org>
	Mon, 14 Mar 2011 19:08:24 +0000 (20:08 +0100)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/processes.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/python.c	patch \|	diff1 \|	diff2 \|	blob \| history