Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 9 Dec 2009 15:50:42 +0000 (16:50 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 9 Dec 2009 15:50:42 +0000 (16:50 +0100)
commit973b70c411688212c081f5e90b89bd657785b81c
treeaa6d3cbd3c5633326130a359ba6507eac3686fea
parent8579aab25eae16e266b03e9b623285e56036c922
parentbc42a61b1f8e518c7decb824dc61e85d4e9f02b8
Merge branch 'collectd-4.7' into collectd-4.8