Merge branch 'collectd-5.4' into collectd-5.5

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

Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)

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

Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)
author Marc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)
committer Marc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/daemon/plugin.c
Simple merge
diff --cc src/modbus.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/modbus.c	patch \|	diff1 \|	diff2 \|	blob \| history