From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 3 Apr 2007 07:05:19 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0-rc4~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=03d51a7c86c0f4e8047e62f1e72ce2208aad97cb;p=collectd.git

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

03d51a7c86c0f4e8047e62f1e72ce2208aad97cb