From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Fri, 20 Apr 2007 06:20:28 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4'
X-Git-Tag: collectd-4.0.0-rc6~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4059b7f729ee092d59d41a92804c83c1dd0d5332;p=collectd.git

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

4059b7f729ee092d59d41a92804c83c1dd0d5332