From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 4 May 2009 17:25:01 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.0~24
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=fe9ba13c8866ada19f7a347f3757d4c740613cdb;p=collectd.git

Merge branch 'collectd-4.6' into collectd-4.7
---

fe9ba13c8866ada19f7a347f3757d4c740613cdb