Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)
commit928e57746b4f67981318b7a4161a3ddd54d2b1a3
tree176896072df05f68781531742384ea65e085ea15
parent42a7c90f4478e98dc970927cfda7ec2e1081f364
parent0657d95eaa686d64efe6bbccda346ebd6467bd0b
Merge branch 'collectd-5.5'
src/curl_json.c
src/curl_xml.c