Merge branch 'collectd-4.4'

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

Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)

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

Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)
diff --cc src/cpu.c
Simple merge
diff --cc src/disk.c
Simple merge
diff --cc src/powerdns.c
Simple merge
diff --cc src/users.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)
		1	2
src/cpu.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/disk.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/powerdns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/users.c	patch \|	diff1 \|	diff2 \|	blob \| history