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

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

8cf1acdb96d027b1d48c9dfb74fea313e63ceedf