Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)
commitd2914ae1474b2d42120c65c3f48be0be7affcb4e
tree543a9ed0592acbf02629bacdf685742262422194
parent7e541dd871f040c19ad6eaada86f1f6d61cff204
parentc89c9b7b5e498e5a77c6eb1b1a88593fcced85f5
Merge branch 'collectd-4.2'
src/collectd.conf.pod
src/configfile.c