From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 27 Feb 2008 07:09:18 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.1~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c999f7e40b0e9ce8f5fd4eb2042d6f3adbd6ce1e;p=collectd.git

Merge branch 'collectd-4.2' into collectd-4.3
---

c999f7e40b0e9ce8f5fd4eb2042d6f3adbd6ce1e