Code

Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 00:19:31 +0000 (01:19 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 00:19:31 +0000 (01:19 +0100)
1  2 
configure.ac
contrib/redhat/collectd.spec
src/collectd.conf.pod

diff --cc configure.ac
Simple merge
Simple merge
Simple merge