Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 7 Jul 2017 16:43:39 +0000 (18:43 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 7 Jul 2017 16:43:57 +0000 (18:43 +0200)
commit9655d4a6d9fa2c4f02032759b831e93933d68bd9
tree28cb1c0be311160e9328ae57799744b093ceede0
parentf3c9335402d5853f98645ca28080600bf565f1ce
parentf374b72032a227a75b6bc9ae574cd28abbc16f24
Merge branch 'collectd-5.7'

Fixes #2328
Conflicts:
src/curl_json.c
src/curl_xml.c
src/apache.c
src/ascent.c
src/bind.c
src/curl.c
src/curl_json.c
src/curl_xml.c
src/nginx.c
src/write_http.c