Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 8 Sep 2014 15:32:54 +0000 (17:32 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 8 Sep 2014 15:32:54 +0000 (17:32 +0200)
1  2 
contrib/redhat/collectd.spec

Simple merge