From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 21 Jan 2008 17:28:27 +0000 (+0100)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.3.0beta0~10^2~3
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0b88f6888705e92ce4472435a464730cf2ce2d5a;p=collectd.git

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

0b88f6888705e92ce4472435a464730cf2ce2d5a