Code

Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)
1  2 
src/curl_xml.c
src/interface.c

diff --cc src/curl_xml.c
Simple merge
diff --cc src/interface.c
Simple merge