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

Merge branch 'collectd-4.2'
---

d2914ae1474b2d42120c65c3f48be0be7affcb4e