Code

Merge branch 'collectd-4.10' into collectd-5.3
authorFlorian Forster <octo@collectd.org>
Mon, 18 Aug 2014 07:33:29 +0000 (09:33 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Aug 2014 07:33:29 +0000 (09:33 +0200)
commit96e0f2341bace029acefe0a88bab96ae326c0ff5
tree3dba62ec4af0aee44d7a4d59ce53208a3cee6dde
parentc6a433718fa3bc3b6192153fee23558ddf011838
parent0afea60611f115a28b8ec331aba610e3038c1ef2
Merge branch 'collectd-4.10' into collectd-5.3
configure.in
src/configfile.c
src/curl.c
src/curl_json.c
src/curl_xml.c
src/snmp.c
src/write_http.c