Merge branch 'collectd-4.5'

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

Fri, 3 Oct 2008 11:35:56 +0000 (13:35 +0200)

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

Fri, 3 Oct 2008 11:35:56 +0000 (13:35 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 11:35:56 +0000 (13:35 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 11:35:56 +0000 (13:35 +0200)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/plugin.c
Simple merge
diff --cc src/snmp.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 3 Oct 2008 11:35:56 +0000 (13:35 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 3 Oct 2008 11:35:56 +0000 (13:35 +0200)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/snmp.c	patch \|	diff1 \|	diff2 \|	blob \| history