Merge branch 'collectd-4.0' into collectd-4.1

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

Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)

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

Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)
author Florian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)
committer Florian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)
diff --cc ChangeLog
Simple merge
diff --cc src/apcups.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)
committer	Florian Forster <octo@huhu.verplant.org>
	Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/apcups.c	patch \|	diff1 \|	diff2 \|	blob \| history