From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 8 Jan 2008 10:25:27 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=79b07973208a37d18818541ed6dcdaac8dc35e0f;p=collectd.git

Merge branch 'collectd-4.2'
---

79b07973208a37d18818541ed6dcdaac8dc35e0f