From: Florian Forster <octo@huhu.verplant.org>
Date: Fri, 28 Sep 2007 14:42:20 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.1' into collectd-4.1
X-Git-Tag: collectd-4.1.3~17
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c7e5d54f1f0189d521eaab82f77842b41040b079;p=collectd.git

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

c7e5d54f1f0189d521eaab82f77842b41040b079