Code

Merge branch 'pull/master'
authorFlorian octo Forster <octo@dev4.office.noris.de>
Wed, 27 Feb 2008 09:24:03 +0000 (10:24 +0100)
committerFlorian octo Forster <octo@dev4.office.noris.de>
Wed, 27 Feb 2008 09:24:03 +0000 (10:24 +0100)
1  2 
src/collectd.c

diff --cc src/collectd.c
Simple merge