Merge branch 'collectd-4.4' into collectd-4.5

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

Fri, 3 Oct 2008 11:35:45 +0000 (13:35 +0200)

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

Fri, 3 Oct 2008 11:35:45 +0000 (13:35 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 11:35:45 +0000 (13:35 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 11:35:45 +0000 (13:35 +0200)
diff --cc contrib/collection.cgi
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/perl.c
Simple merge
diff --cc src/plugin.c
Simple merge
diff --cc src/powerdns.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 3 Oct 2008 11:35:45 +0000 (13:35 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 3 Oct 2008 11:35:45 +0000 (13:35 +0200)
		1	2
contrib/collection.cgi	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/perl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/powerdns.c	patch \|	diff1 \|	diff2 \|	blob \| history