From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 15 Jul 2008 14:32:37 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d767db104769bed7fefea61538bdacb364434e9a;p=collectd.git

Merge branch 'collectd-4.3' into collectd-4.4
---

d767db104769bed7fefea61538bdacb364434e9a