From: Florian Forster <octo@huhu.verplant.org>
Date: Fri, 24 Aug 2007 10:12:40 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.0' into collectd-4.0
X-Git-Tag: collectd-4.0.7~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=29a9c44c3599a44d55dbb0157aa61c04ac175206;p=collectd.git

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

29a9c44c3599a44d55dbb0157aa61c04ac175206