From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 5 Nov 2006 12:16:07 +0000 (+0100)
Subject: Merge branch 'master' into ls/sensors
X-Git-Tag: collectd-3.11.0~61
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0c7a16efd4921637d986f590c3e584de4be6d4bd;p=collectd.git

Merge branch 'master' into ls/sensors
---

0c7a16efd4921637d986f590c3e584de4be6d4bd