From: Florian Forster <octo@noris.net>
Date: Wed, 24 Mar 2010 09:08:51 +0000 (+0100)
Subject: Merge branch 'master' into ff/modbus
X-Git-Tag: collectd-4.10.0~28^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d86f0d115cc8e8d80167b65a24aa6ee7404bc766;p=collectd.git

Merge branch 'master' into ff/modbus
---

d86f0d115cc8e8d80167b65a24aa6ee7404bc766