Merge branch 'collectd-5.6' into collectd-5.7
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 9 Jan 2017 10:42:21 +0000 (11:42 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 9 Jan 2017 10:42:21 +0000 (11:42 +0100)
commitd3be3ed7cb69be4a9a256449d4885d4a55399de0
tree0654ad56fe09bc5bb227d92f06ad19a16f7a1ae4
parentcdb49f39d11028bd99a0e4b0aa02d3ac956982fe
parente7f68a40cf0db99a51afc1029c0697c661a7c4aa
Merge branch 'collectd-5.6' into collectd-5.7
src/curl_json.c