Merge branch 'collectd-4.10' into collectd-5.3

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

Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)

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

Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/types_list.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/types_list.c	patch \|	diff1 \|	diff2 \|	blob \| history