Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 19 May 2015 20:44:15 +0000 (22:44 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 19 May 2015 20:44:15 +0000 (22:44 +0200)
commit51612a1b2f96f6e360f874f6da0b20eac94f48b3
tree973e525353ad739f9e447d14804c7b1240c02a83
parent9708614487ec93df67ad1095f3cf5a0987b9cc28
parent967685afeaff2cb4f7e4f733f17df95363727c4f
Merge branch 'collectd-5.3' into collectd-5.4
configure.ac
src/curl_xml.c
src/processes.c
src/zfs_arc.c