Merge branch 'collectd-5.3' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Thu, 26 Feb 2015 11:49:58 +0000 (12:49 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 26 Feb 2015 11:49:58 +0000 (12:49 +0100)
commit1ec46a6e59cb17f11633a0c07865c2e9e44d374e
treefbfe9e05b1f6871cf4fd741780b469103d496fb5
parent587f01f89af11c4acebbec44293528b77c779218
parent7f8f2f96cdccf063b51c31c965cd19f0cd6281e3
Merge branch 'collectd-5.3' into collectd-5.4
ChangeLog