Merge branch 'collectd-5.5' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 20:26:31 +0000 (22:26 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 20:26:31 +0000 (22:26 +0200)
commit02f8dbc0985310574ea2837cd5e3c06cccda203d
treeecdc943a492ed8cd76014d7ebe5c43bb0c443353
parent7e3059ba3dde87dbe89e21cb7844a10f9e83d6f5
parentba52f94929822b1968f05cfbb37985af2e0b83a4
Merge branch 'collectd-5.5' into collectd-5.6
src/apache.c
src/collectd.conf.in
src/collectd.conf.pod
src/curl_json.c