Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 2 Sep 2007 17:28:25 +0000 (19:28 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 2 Sep 2007 17:28:25 +0000 (19:28 +0200)
commitedc842a72e095b67348ed96d287c857ead49d229
tree75b29580626b025aaf8631e8d2de80f3480361af
parentdfe9d52458a8aeef0c299e41ada8edc0d855c3b9
parent2a9fc51175197c5641c2cbe3f110f41e712b4a87
Merge branch 'collectd-4.0' into collectd-4.1