From: Florian Forster <octo@noris.net>
Date: Tue, 29 Apr 2008 15:45:16 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~158
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d98487a27d294e31f483b9d43e0d6c02717d248c;p=collectd.git

Merge branch 'collectd-4.4'

Conflicts:

	src/sensors.c
---

d98487a27d294e31f483b9d43e0d6c02717d248c