From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 29 Mar 2007 17:22:11 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0~120
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6dee31bca87a552017791aa97afa9bd40bc0ebfe;p=collectd.git

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

6dee31bca87a552017791aa97afa9bd40bc0ebfe