Merge branch 'collectd-4.1' into collectd-4.2

author Florian Forster <octo@noris.net>

Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)

committer Florian Forster <octo@noris.net>

Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)
author Florian Forster <octo@noris.net>
Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)
committer Florian Forster <octo@noris.net>
Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)
diff --cc src/collectd-snmp.pod
Simple merge
diff --cc src/types.db
Simple merge
author	Florian Forster <octo@noris.net>
	Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)
committer	Florian Forster <octo@noris.net>
	Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)
		1	2
src/collectd-snmp.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history