![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 15 Jan 2007 17:36:26 +0000 (18:36 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 15 Jan 2007 17:36:26 +0000 (18:36 +0100) | ||
| commit | 1f1da34268a497dfeba6502084bb51ec2875b032 | |
| tree | aac2dff8c833130f5563f43f61fa9e27c313e28f | tree | snapshot |
| parent | fae34a369b1001291ca7e1b51f364c42946698d4 | commit | diff |
| parent | 07d5fdf21191d401d5ad06f49d689b6cdeda1635 | commit | diff |
Merge branch 'master' into collectd-4
Conflicts:
src/sensors.c
Conflicts:
src/sensors.c