Code

Merge branch 'collectd-4.2'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)
1  2 
src/logfile.c
src/network.c

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