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)
commit5841d1fb13436af787c748a965084cb06e66d326
treee9d5235ff3dc8846bdb02e3bf4f77ccdc7bbee30
parentff9e11ade5cfabf32c63fb19fc76cbbc4186bc5b
parent213eb227d7737bfbd899474033f94342c61dcb8c
Merge branch 'collectd-5.5'
src/curl.c
src/curl_json.c
src/curl_xml.c