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)
commitf64a8b0906df8f97fbe91f15a919c76b83f93ba9
tree625c723a4219c73f657ffeb6c56cfd41eef5ec09
parentd143bc65a6984281b7c757fd5ea6ef27af5681bb
parentf664b944f774e4d1e5d5c562eaf0bb207c6a7edf
Merge branch 'collectd-5.5'
configure.ac
contrib/redhat/collectd.spec
src/collectd.conf.pod