From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 27 Oct 2007 09:09:25 +0000 (+0200)
Subject: Merge branch 'collectd-4.1'
X-Git-Tag: collectd-4.2.0~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8dfe4231f01b23205be2128a6f5c1e49a701ee83;p=collectd.git

Merge branch 'collectd-4.1'
---

8dfe4231f01b23205be2128a6f5c1e49a701ee83