Code

Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:28:27 +0000 (18:28 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:28:27 +0000 (18:28 +0100)
1  2 
src/collectd-exec.pod
src/logfile.c

Simple merge
diff --cc src/logfile.c
Simple merge