Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 19 May 2015 20:44:27 +0000 (22:44 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 19 May 2015 20:44:27 +0000 (22:44 +0200)
1  2 
src/curl_xml.c

diff --cc src/curl_xml.c
Simple merge