Merge branch 'collectd-5.5'

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

Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)

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

Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/netapp.c
Simple merge
diff --cc src/openldap.c
Simple merge
diff --cc src/rrdtool.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/netapp.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/openldap.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/rrdtool.c	patch \|	diff1 \|	diff2 \|	blob \| history