Merge branch 'collectd-4.4' into collectd-4.5

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

Sat, 24 Jan 2009 10:04:22 +0000 (11:04 +0100)

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

Sat, 24 Jan 2009 10:04:22 +0000 (11:04 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 24 Jan 2009 10:04:22 +0000 (11:04 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 24 Jan 2009 10:04:22 +0000 (11:04 +0100)
diff --cc contrib/cussh.pl
Simple merge
diff --cc src/ascent.c
Simple merge
diff --cc src/tcpconns.c
Simple merge
diff --cc src/utils_cache.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 24 Jan 2009 10:04:22 +0000 (11:04 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 24 Jan 2009 10:04:22 +0000 (11:04 +0100)
		1	2
contrib/cussh.pl	patch \|	diff1 \|	diff2 \|	blob \| history
src/ascent.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/tcpconns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils_cache.c	patch \|	diff1 \|	diff2 \|	blob \| history