Code

Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Fri, 7 Oct 2011 15:27:06 +0000 (17:27 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 7 Oct 2011 15:27:06 +0000 (17:27 +0200)
commit0cdc4e286b41b6800ab8b371aa391ecbd0fd628a
treef7b9965a7c117681b961e95a73df0052f787a040
parent61fba41289decabc1a18c855fcd462fece9ab983
parent9fbe348af96fa4a44fbdc1bd96fa98344f06c760
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
src/collectd.conf.in
src/curl_json.c
version-gen.sh

Change-Id: I313c0d3c73d47481baa0a3b38bcdf508f1d4f8d8
ChangeLog
src/collectd.conf.in
src/curl_json.c