]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Feb 2015 08:57:29 +0000 (09:57 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Feb 2015 08:57:29 +0000 (09:57 +0100)
1  2 
configure.ac
contrib/redhat/collectd.spec
src/Makefile.am
src/collectd.conf.pod

diff --cc configure.ac
Simple merge
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge