Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Tue, 16 May 2017 17:34:25 +0000 (19:34 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 May 2017 17:34:25 +0000 (19:34 +0200)
1  2 
src/collectd.conf.pod
src/curl_json.c
src/perl.c

Simple merge
diff --cc src/curl_json.c
Simple merge
diff --cc src/perl.c
Simple merge