]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 7 Jan 2015 23:17:37 +0000 (00:17 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 7 Jan 2015 23:17:37 +0000 (00:17 +0100)
1  2 
configure.ac
contrib/redhat/collectd.spec
src/collectd.conf.in

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