Code

Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Jun 2016 06:19:12 +0000 (08:19 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Jun 2016 06:19:12 +0000 (08:19 +0200)
commit7b64cc91d3307179557b25b6ece2349a088f4294
tree2b69b9125e097e84502dd6fe7bd0146c419f7f78
parentac06baf4723fe074b501ba210cb461015352e556
parente2b289ea039269b60edd459d2d514d3f82820e3a
Merge branch 'collectd-5.5'
src/collectd.conf.pod