Merge branch 'collectd-4.6' into collectd-4.7

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

Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)

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

Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)
author Florian Forster <octo@huhu.verplant.org>
Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)
committer Florian Forster <octo@huhu.verplant.org>
Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)
diff --cc configure.in
Simple merge
diff --cc src/plugin.c
Simple merge
diff --cc src/rrdtool.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)
committer	Florian Forster <octo@huhu.verplant.org>
	Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/rrdtool.c	patch \|	diff1 \|	diff2 \|	blob \| history