From: Florian Forster <octo@noris.net>
Date: Tue, 29 Apr 2008 15:43:19 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2
X-Git-Tag: collectd-4.4.0~4^2~6^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d8a27138e0fc455088443ca034942a00c3b4eecd;p=collectd.git

Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2
---

d8a27138e0fc455088443ca034942a00c3b4eecd