Merge branch 'collectd-4.9'

author Florian Forster <octo@huhu.verplant.org>

Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)

committer Florian Forster <octo@huhu.verplant.org>

Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)
author Florian Forster <octo@huhu.verplant.org>
Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)
committer Florian Forster <octo@huhu.verplant.org>
Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/network.c
Simple merge
diff --cc src/snmp.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)
committer	Florian Forster <octo@huhu.verplant.org>
	Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/network.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/snmp.c	patch \|	diff1 \|	diff2 \|	blob \| history