Merge branch 'collectd-4.5'

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

Tue, 2 Dec 2008 22:31:32 +0000 (23:31 +0100)

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

Tue, 2 Dec 2008 22:31:32 +0000 (23:31 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 2 Dec 2008 22:31:32 +0000 (23:31 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 2 Dec 2008 22:31:32 +0000 (23:31 +0100)
diff --cc src/plugin.c
Simple merge
diff --cc src/plugin.h
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 2 Dec 2008 22:31:32 +0000 (23:31 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 2 Dec 2008 22:31:32 +0000 (23:31 +0100)
		1	2
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.h	patch \|	diff1 \|	diff2 \|	blob \| history