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)
commitce07c14003240fcd63a8aa70c7261d14792fb76e
tree1fce17fd8f1391db9ee2ea1c62ac2fab2acae91b
parent8afc7e0da30654711884328c2d6b09fc3370c8f7
parent9214ecbf1989684ba85a1f9a6fc684af37f861ae
Merge branch 'master' of /var/lib/git/collectd
src/thermal.c