Merge branch 'collectd-4.3' into collectd-4.4

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

Wed, 30 Apr 2008 08:59:32 +0000 (10:59 +0200)

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

Wed, 30 Apr 2008 08:59:32 +0000 (10:59 +0200)
author Florian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 08:59:32 +0000 (10:59 +0200)
committer Florian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 08:59:32 +0000 (10:59 +0200)
diff --cc bindings/perl/Collectd.pm
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/collectd.c
Simple merge
diff --cc src/perl.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Wed, 30 Apr 2008 08:59:32 +0000 (10:59 +0200)
committer	Florian Forster <octo@huhu.verplant.org>
	Wed, 30 Apr 2008 08:59:32 +0000 (10:59 +0200)
		1	2
bindings/perl/Collectd.pm	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/perl.c	patch \|	diff1 \|	diff2 \|	blob \| history