Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200)
commit213eb227d7737bfbd899474033f94342c61dcb8c
treee486e1faba81f2b39b91e25717c38e11a8982df6
parentc346dc6b18ee4215ccab911c1732c5c39a961baf
parent5b1caeeadcecd798ee4b386b15c17cb7591a8bfe
Merge branch 'collectd-5.4' into collectd-5.5
src/curl.c
src/curl_json.c
src/curl_xml.c