Merge branch 'master' of /var/lib/git/collectd
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 12 Jun 2008 08:24:10 +0000 (10:24 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 12 Jun 2008 08:24:10 +0000 (10:24 +0200)
1  2 
src/thermal.c

diff --cc src/thermal.c
Simple merge