Merge branch 'collectd-5.4'

Conflicts:
	src/write_graphite.c

diff --cc configure.ac
Simple merge

diff --cc src/collectd.conf.in
index cc8f556ccebe2442d7e93bc3e35acaa153dbe607,6d19c3222786c76890cc702265a9e10dafe7586c..4de39f0a05f70f641bddcfb519222201b9605fb2
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -1179,9 -1182,9 +1186,10 @@@
  #             Protocol UDP
  #             StoreRates true
  #             AlwaysAppendDS false
+ #             TTLFactor 2.0
  #     </Node>
  #     Tag "foobar"
 +#       Attribute "foo" "bar"
  #</Plugin>
  
  ##############################################################################

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/curl_xml.c
Simple merge