Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 19:04:04 +0000 (21:04 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 19:04:04 +0000 (21:04 +0200)
1  2 
src/curl.c
src/curl_json.c
src/curl_xml.c

diff --cc src/curl.c
Simple merge
diff --cc src/curl_json.c
Simple merge
diff --cc src/curl_xml.c
Simple merge