From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 15 Jan 2007 17:36:26 +0000 (+0100)
Subject: Merge branch 'master' into collectd-4
X-Git-Tag: collectd-4.0.0~231
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=1f1da34268a497dfeba6502084bb51ec2875b032

Merge branch 'master' into collectd-4

Conflicts:

	src/sensors.c
---

1f1da34268a497dfeba6502084bb51ec2875b032