Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:53:49 +0000 (00:53 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:53:49 +0000 (00:53 +0200)
commit079f487bae003575e360dcd6034546485f69b5c8
tree5abd496a7bcbca61f993c6874e51077ea3eec538
parent2b9664594b14d33b989924657dd2ef4b1a53589a
parentc5da45dfcfa86313c381af15519e304c995d9f59
Merge branch 'collectd-5.3' into collectd-5.4
src/collectd.conf.pod