Merge branch 'collectd-5.5'

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

Tue, 27 Oct 2015 23:03:06 +0000 (00:03 +0100)

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

Tue, 27 Oct 2015 23:03:06 +0000 (00:03 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Tue, 27 Oct 2015 23:03:06 +0000 (00:03 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Tue, 27 Oct 2015 23:03:06 +0000 (00:03 +0100)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/write_redis.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 27 Oct 2015 23:03:06 +0000 (00:03 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 27 Oct 2015 23:03:06 +0000 (00:03 +0100)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/write_redis.c	patch \|	diff1 \|	diff2 \|	blob \| history