Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Mar 2015 06:00:35 +0000 (07:00 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Mar 2015 06:00:35 +0000 (07:00 +0100)
commit491b8f0185c63c662bb3f395630a6d8b9913b49e
tree4982713dae8305c9f4df5d885a5ce05806ba0563
parent0ea3dd8c7e3df6a0cac20be4c70f3f6a7433a041
parent257877038f937becbcc9075d4ee0c4ea48c8671b
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec
src/collectd.conf.pod
src/collectd.conf.in
src/collectd.conf.pod