[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/collectd.conf.pod |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 79b07973208a37d18818541ed6dcdaac8dc35e0f
Merge: d2914ae1474b2d42120c65c3f48be0be7affcb4e af763dafe80f13e3992dd10287d17ed91c377757
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 8 11:25:27 2008 +0100

    Merge branch 'collectd-4.2'

commit af763dafe80f13e3992dd10287d17ed91c377757
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 8 11:25:20 2008 +0100

    collectd.conf(5): Fix a messed up merge.