Merge branch 'collectd-5.3' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)
Conflicts:
contrib/redhat/collectd.spec


No differences found