From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 22 Dec 2006 09:38:07 +0000 (+0100)
Subject: Merge branch 'ls/sensors'
X-Git-Tag: collectd-3.11.0~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2d17d81b7a816e968241b809ec7004d3dde6e3f6;p=collectd.git

Merge branch 'ls/sensors'
---

2d17d81b7a816e968241b809ec7004d3dde6e3f6