Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:25:27 +0000 (11:25 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:25:27 +0000 (11:25 +0100)
commit79b07973208a37d18818541ed6dcdaac8dc35e0f
tree3d6a6f1d833a45ffd5d8c8cc87c4aa80f22c2101
parentd2914ae1474b2d42120c65c3f48be0be7affcb4e
parentaf763dafe80f13e3992dd10287d17ed91c377757
Merge branch 'collectd-4.2'
src/collectd.conf.pod