From: Florian Forster <octo@huhu.verplant.org>
Date: Fri, 20 Apr 2007 14:16:27 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0-rc6~9^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d9256059b2a356625feabe5bb44539eef0660d5a;p=collectd.git

Merge branch 'pull/collectd-4' into collectd-4
---

d9256059b2a356625feabe5bb44539eef0660d5a