Merge branch 'collectd-4.10' into collectd-5.3

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

Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)

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

Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)
diff --cc src/curl_xml.c
Simple merge
diff --cc src/interface.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)
		1	2
src/curl_xml.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history