Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Wed, 9 Dec 2015 08:49:55 +0000 (09:49 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 9 Dec 2015 08:49:55 +0000 (09:49 +0100)
1  2 
src/curl_json.c
src/curl_xml.c

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