Code

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)
commit587f01f89af11c4acebbec44293528b77c779218
tree06218a90e3e415971d3f50a684c68701ca41b9d3
parentecbcaadde7dff838f09dfb04c7eb90f126e35abf
parentd1483d2e2a9116c233aeaceba99fa58a7e6bdc87
Merge branch 'collectd-5.3' into collectd-5.4
configure.ac
contrib/redhat/collectd.spec
src/Makefile.am
src/collectd.conf.pod