Merge branch 'collectd-5.0'

author Florian Forster <octo@collectd.org>

Sun, 27 Mar 2011 17:06:47 +0000 (10:06 -0700)

committer Florian Forster <octo@collectd.org>

Sun, 27 Mar 2011 17:06:47 +0000 (10:06 -0700)
author Florian Forster <octo@collectd.org>
Sun, 27 Mar 2011 17:06:47 +0000 (10:06 -0700)
committer Florian Forster <octo@collectd.org>
Sun, 27 Mar 2011 17:06:47 +0000 (10:06 -0700)
diff --cc ChangeLog
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@collectd.org>
	Sun, 27 Mar 2011 17:06:47 +0000 (10:06 -0700)
committer	Florian Forster <octo@collectd.org>
	Sun, 27 Mar 2011 17:06:47 +0000 (10:06 -0700)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history