From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 3 Sep 2007 14:00:51 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4320ac5ec142c87bcf634cd85b89eadea65011ff;p=collectd.git

Merge branch 'collectd-4.0' into collectd-4.1
---

4320ac5ec142c87bcf634cd85b89eadea65011ff