Code

Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Tue, 16 May 2017 17:36:27 +0000 (19:36 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 May 2017 17:36:27 +0000 (19:36 +0200)
commita6f29de68fe19614b0aa90e920e99d72cb0f4468
tree76a2199fcbbf67f335ad90b4f85486e3b8a56e47
parente66358769e4af95c8c2e6266c9bbfb54e2c3e02b
parentfbaf81a04c23d51947d94a5c7d9142290dff07bc
Merge branch 'collectd-5.7'
src/collectd.conf.pod
src/curl_json.c
src/perl.c