Code

Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Wed, 9 Dec 2015 08:49:55 +0000 (09:49 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 9 Dec 2015 08:49:55 +0000 (09:49 +0100)
commit0657d95eaa686d64efe6bbccda346ebd6467bd0b
tree38bbcbdbd4e5546e6da925a151f791960f6a72af
parentd89829d22853ee0b7678b6e2ee7fdd359f3b7202
parent76861053164f54a21651612daf89a30cca657184
Merge branch 'collectd-5.4' into collectd-5.5
src/curl_json.c
src/curl_xml.c