From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 11 Sep 2007 09:50:51 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.1~2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=27f6db4769cac5727888c327dbbf1b88da4f3ca6

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

27f6db4769cac5727888c327dbbf1b88da4f3ca6