Merge branch 'sh/hddtemp'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 18 Feb 2008 19:53:32 +0000 (20:53 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 18 Feb 2008 19:53:32 +0000 (20:53 +0100)
commitf99cbc5ea9873ce331c27fa698396fdc0cd02d68
treeb0edd9021ae7830bc8a09626d90b9dd56c1dc5c3
parent7284486320eb036e9d4e60d2e68f4b05421ee785
parent24db3832cf2d74fe5425de379d10dc73d141c2f9
Merge branch 'sh/hddtemp'
src/collectd.conf.in
src/collectd.conf.pod