Merge branch 'collectd-4.4'
authorFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:45:16 +0000 (17:45 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:45:16 +0000 (17:45 +0200)
Conflicts:

src/sensors.c

1  2 
src/sensors.c

diff --cc src/sensors.c
Simple merge