Merge branch 'collectd-5.5'

author Florian Forster <octo@collectd.org>

Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)

committer Florian Forster <octo@collectd.org>

Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)
author Florian Forster <octo@collectd.org>
Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)
committer Florian Forster <octo@collectd.org>
Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)
diff --cc src/curl_json.c
Simple merge
diff --cc src/curl_xml.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)
committer	Florian Forster <octo@collectd.org>
	Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)
		1	2
src/curl_json.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/curl_xml.c	patch \|	diff1 \|	diff2 \|	blob \| history