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)
commit76fb10bf790e35dd6caca13c4bb5d0f86c517370
tree8db5233edf626c9f8613bdd66f18238c3774945d
parent211bd48433190a4623d38ec70bcd5266e880066c
parente37e426d6646d6ff99834461f00c3dd79fa85d43
Merge branch 'collectd-5.7'
configure.ac
contrib/redhat/collectd.spec
src/curl_json.c