From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 31 Jul 2007 07:29:46 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.0' into collectd-4.0
X-Git-Tag: collectd-4.0.6~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=69faa36263df439329148ed30b877b41ec6a6d93;p=collectd.git

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

69faa36263df439329148ed30b877b41ec6a6d93