Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 29 Aug 2014 15:26:41 +0000 (17:26 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 29 Aug 2014 15:26:41 +0000 (17:26 +0200)
Conflicts:
contrib/redhat/collectd.spec


No differences found