Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 10 Jan 2014 14:39:31 +0000 (15:39 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 10 Jan 2014 14:39:31 +0000 (15:39 +0100)
commitac16c8169106f29d890982cce36bb4cfa7af0429
tree880bb700ecde8733e1d977290e4e52a7d66dd455
parent4c6303ec6be673df6c9e0964dfc9419c697bf47c
parent54ef2ae58f8ef125cf1d3aefe3ac839ba7e67f8a
Merge branch 'collectd-5.4'

Conflicts:
src/write_graphite.c
configure.ac
src/collectd.conf.in
src/collectd.conf.pod
src/curl.c
src/curl_json.c
src/curl_xml.c