Code

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)
1  2 
src/collectd.conf.pod
src/configfile.c

Simple merge
Simple merge