Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 28 Sep 2007 14:42:13 +0000 (16:42 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 28 Sep 2007 14:42:13 +0000 (16:42 +0200)
commitebf2e171eb457394e498cada2be85bcef24d6221
tree3c90f9a0e25cdf5afa6b33899d6a1493f37a7558
parentad52e3aa2f9fcc61bb3e999af11d162bc790921c
parentccb9071b7964b99ae616c9b324ca7413c08f8809
Merge branch 'pull/collectd-4.0' into collectd-4.0