From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 21 Jan 2008 17:30:26 +0000 (+0100)
Subject: Merge branch 'pull/collectd-4.2' into collectd-4.2
X-Git-Tag: collectd-4.3.0beta0~10^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ff4ebc0fd3c93a39a18edc629d61787f60a92706;p=collectd.git

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

ff4ebc0fd3c93a39a18edc629d61787f60a92706