From: Florian Forster <octo@noris.net>
Date: Wed, 17 Mar 2010 12:45:36 +0000 (+0100)
Subject: Merge branch 'master' into ff/modbus
X-Git-Tag: collectd-4.10.0~28^2~11
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=e10ed40edcfd48088b53b34eb780cdaaac2062de

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

e10ed40edcfd48088b53b34eb780cdaaac2062de