Merge branch 'collectd-4.8'

author Florian Forster <octo@noris.net>

Wed, 21 Oct 2009 08:21:10 +0000 (10:21 +0200)

committer Florian Forster <octo@noris.net>

Wed, 21 Oct 2009 08:21:10 +0000 (10:21 +0200)
author Florian Forster <octo@noris.net>
Wed, 21 Oct 2009 08:21:10 +0000 (10:21 +0200)
committer Florian Forster <octo@noris.net>
Wed, 21 Oct 2009 08:21:10 +0000 (10:21 +0200)
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/collectd.conf.in
Simple merge
author	Florian Forster <octo@noris.net>
	Wed, 21 Oct 2009 08:21:10 +0000 (10:21 +0200)
committer	Florian Forster <octo@noris.net>
	Wed, 21 Oct 2009 08:21:10 +0000 (10:21 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history