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)
1  2 
src/curl_json.c

diff --cc src/curl_json.c
Simple merge