Merge branch 'collectd-5.5'

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 26 Feb 2016 21:58:15 +0000 (22:58 +0100)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 26 Feb 2016 21:58:15 +0000 (22:58 +0100)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 26 Feb 2016 21:58:15 +0000 (22:58 +0100)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 26 Feb 2016 21:58:15 +0000 (22:58 +0100)
diff --cc configure.ac
Simple merge
diff --cc src/apache.c
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/modbus.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 26 Feb 2016 21:58:15 +0000 (22:58 +0100)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 26 Feb 2016 21:58:15 +0000 (22:58 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/apache.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/modbus.c	patch \|	diff1 \|	diff2 \|	blob \| history