Merge branch 'collectd-5.5'

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

Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)

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

Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)
author Marc Fournier <marc.fournier@camptocamp.com>
Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)
committer Marc Fournier <marc.fournier@camptocamp.com>
Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/routeros.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/routeros.c	patch \|	diff1 \|	diff2 \|	blob \| history