From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 18 Feb 2008 19:53:44 +0000 (+0100)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.3.0~8^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7ab531887edb3758b6db0fc0c00aa4beee1bc3e2;p=collectd.git

Merge branch 'collectd-4.1' into collectd-4.2
---

7ab531887edb3758b6db0fc0c00aa4beee1bc3e2