From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Wed, 27 Feb 2008 14:33:45 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.1~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=8057cd230cbc322e17f7435732ea5b73eef1fa08;p=collectd.git

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

8057cd230cbc322e17f7435732ea5b73eef1fa08