From: Florian Forster <octo@huhu.verplant.org>
Date: Sun, 2 Sep 2007 15:55:38 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.0' into collectd-4.0
X-Git-Tag: collectd-4.0.8~16
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=32957f99ace1cb96afbbcebe6a5ae07df0f89013;p=collectd.git

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

32957f99ace1cb96afbbcebe6a5ae07df0f89013