Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 16 Jun 2015 07:18:25 +0000 (09:18 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 16 Jun 2015 07:18:25 +0000 (09:18 +0200)
1  2 
configure.ac
contrib/redhat/collectd.spec
src/collectd.conf.pod

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