Merge branch 'collectd-5.3' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)
commitfd7673e5e9ad074624fc23cda5d2ec4549d43659
tree62d538d34a0b53b8a81d19fdacd61cf722d26600
parent3c424eba3b919af518e4078bd5856f95d3a6ef47
parent96e0f2341bace029acefe0a88bab96ae326c0ff5
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec
configure.ac
contrib/redhat/collectd.spec
src/Makefile.am
src/collectd.conf.pod
src/common.c
src/configfile.c
src/curl.c
src/curl_json.c
src/curl_xml.c
src/write_riemann.c