Merge branch 'master' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Jan 2007 17:36:26 +0000 (18:36 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Jan 2007 17:36:26 +0000 (18:36 +0100)
commit1f1da34268a497dfeba6502084bb51ec2875b032
treeaac2dff8c833130f5563f43f61fa9e27c313e28f
parentfae34a369b1001291ca7e1b51f364c42946698d4
parent07d5fdf21191d401d5ad06f49d689b6cdeda1635
Merge branch 'master' into collectd-4

Conflicts:

src/sensors.c