Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 21 Jan 2016 20:29:18 +0000 (21:29 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 21 Jan 2016 20:29:18 +0000 (21:29 +0100)
commit029e88709f60d90fede55ed31f775602c1487d24
tree0e1bdd6f2abf7dd2c811ab372e11e0bfc22d69fc
parent9c8f3110063cf83fa146929d5f28f8ecf17a4ffd
parent218c57128f2e54960133cff3e774b5ef9944068a
Merge branch 'collectd-5.5'
src/collectd.conf.in
src/collectd.conf.pod
src/virt.c