From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 21 Jan 2008 10:01:03 +0000 (+0100)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.2.4^0
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=f71467d9c2097ddd9eb772a4fdb985663168ec71;p=collectd.git

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

f71467d9c2097ddd9eb772a4fdb985663168ec71