From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 23 Feb 2008 09:58:09 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.1~11
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=89783745dc59079eab34e0c52de6e5e972f50eb2;p=collectd.git

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

89783745dc59079eab34e0c52de6e5e972f50eb2