Merge branch 'collectd-5.7'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 10 Jan 2017 22:03:15 +0000 (23:03 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 10 Jan 2017 22:03:15 +0000 (23:03 +0100)
1  2 
configure.ac
contrib/redhat/collectd.spec
src/curl_json.c

diff --cc configure.ac
Simple merge
Simple merge
diff --cc src/curl_json.c
Simple merge