Merge branch 'ff/gmond'

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

Mon, 9 Mar 2009 17:48:20 +0000 (18:48 +0100)

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

Mon, 9 Mar 2009 17:48:20 +0000 (18:48 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 9 Mar 2009 17:48:20 +0000 (18:48 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 9 Mar 2009 17:48:20 +0000 (18:48 +0100)
diff --cc README
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 9 Mar 2009 17:48:20 +0000 (18:48 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 9 Mar 2009 17:48:20 +0000 (18:48 +0100)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history