From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 11 Sep 2007 09:46:07 +0000 (+0200)
Subject: Merge branch 'uni/collectd-4.1' into collectd-4.1
X-Git-Tag: collectd-4.1.1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=549e1f3857209db73e5e254be7aa1782c5face0c;p=collectd.git

Merge branch 'uni/collectd-4.1' into collectd-4.1
---

549e1f3857209db73e5e254be7aa1782c5face0c