Merge branch 'collectd-4.10' into collectd-5.0

author Florian Forster <octo@collectd.org>

Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)

committer Florian Forster <octo@collectd.org>

Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)
author Florian Forster <octo@collectd.org>
Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)
committer Florian Forster <octo@collectd.org>
Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/snmp.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)
committer	Florian Forster <octo@collectd.org>
	Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/snmp.c	patch \|	diff1 \|	diff2 \|	blob \| history