Merge branch 'collectd-4.4'

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

Tue, 3 Jun 2008 17:20:49 +0000 (19:20 +0200)

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

Tue, 3 Jun 2008 17:20:49 +0000 (19:20 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 3 Jun 2008 17:20:49 +0000 (19:20 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 3 Jun 2008 17:20:49 +0000 (19:20 +0200)
diff --cc contrib/cussh.pl
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/perl.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 3 Jun 2008 17:20:49 +0000 (19:20 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 3 Jun 2008 17:20:49 +0000 (19:20 +0200)
		1	2
contrib/cussh.pl	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/perl.c	patch \|	diff1 \|	diff2 \|	blob \| history