Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 20:27:34 +0000 (22:27 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 20:27:34 +0000 (22:27 +0200)
commit03af72c5ef8b98ddfcab87ea44b764f5b0e165aa
tree2cf232a7ed1875c51a592e6e32f9852150794b03
parentc4d79642e546f4992d5d4b3d62ae74490d21ee87
parent02f8dbc0985310574ea2837cd5e3c06cccda203d
Merge branch 'collectd-5.6'

Conflicts:
src/collectd.conf.in
src/apache.c
src/collectd.conf.in
src/collectd.conf.pod
src/curl_json.c