Merge branch 'collectd-4.10' into collectd-5.3

author Marc Fournier <marc.fournier@camptocamp.com>

Mon, 24 Nov 2014 08:18:44 +0000 (09:18 +0100)

committer Marc Fournier <marc.fournier@camptocamp.com>

Mon, 24 Nov 2014 08:18:44 +0000 (09:18 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Mon, 24 Nov 2014 08:18:44 +0000 (09:18 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Mon, 24 Nov 2014 08:18:44 +0000 (09:18 +0100)
diff --cc src/plugin.c
Simple merge
diff --cc src/snmp.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Mon, 24 Nov 2014 08:18:44 +0000 (09:18 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Mon, 24 Nov 2014 08:18:44 +0000 (09:18 +0100)
		1	2
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/snmp.c	patch \|	diff1 \|	diff2 \|	blob \| history