Merge branch 'collectd-3.10'

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

Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)

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

Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)
diff --cc configure.in
Simple merge
diff --cc src/apcups.c
Simple merge
diff --cc src/collectd.conf.in
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/apcups.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history