Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)
commit06efe4f50bbdfbade922b8a3ee4576eb2cc4562c
tree040977566e0fa98097c601b6bafc93b0db21f258
parenta761816a12f3238246d301719888bbb63b6b1e7c
parent9ad5eefaa9dcc557c9117f8692cec1792f7ac7f0
Merge branch 'collectd-5.5'
configure.ac
src/collectd.conf.pod
src/routeros.c