Merge branch 'collectd-5.4' into collectd-5.5

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)
diff --cc src/curl.c
Simple merge
diff --cc src/curl_json.c
Simple merge
diff --cc src/curl_xml.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)
		1	2
src/curl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/curl_json.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/curl_xml.c	patch \|	diff1 \|	diff2 \|	blob \| history