From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 6 May 2008 11:44:46 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.4.0~4^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=53bd9256920f01cc5b835639c7e7971979ed3350;p=collectd.git

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

53bd9256920f01cc5b835639c7e7971979ed3350