Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 8 Sep 2014 15:21:38 +0000 (17:21 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 8 Sep 2014 15:21:38 +0000 (17:21 +0200)
commit9f2145dc771af94c7a7c49c20210d6870c7955e7
tree2535301051157299a2d5aeca475af9f394b3bef2
parentac3fed091af7e3694623479c49728417210af56e
parentf9cb7ef9c5b2d846146e5dd1cbc894b5139c47cc
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec
contrib/redhat/collectd.spec