From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 23 Jan 2008 19:53:57 +0000 (+0100)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.3.0beta0~10^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=abf236a5ede80324ef7dc609d033ff919a0afdcc;p=collectd.git

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

abf236a5ede80324ef7dc609d033ff919a0afdcc