Merge branch 'collectd-4.5' into collectd-4.6

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

Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)

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

Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)
diff --cc configure.in
Simple merge
diff --cc src/configfile.c
Simple merge
diff --cc src/utils_cache.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/configfile.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils_cache.c	patch \|	diff1 \|	diff2 \|	blob \| history