From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 19 Feb 2008 13:00:37 +0000 (+0100)
Subject: Merge branch 'pull/collectd-4.1' into collectd-4.1
X-Git-Tag: collectd-4.2.5~15^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=bd21265ce20def847ceb4b0f90330f25a91522bf

Merge branch 'pull/collectd-4.1' into collectd-4.1
---

bd21265ce20def847ceb4b0f90330f25a91522bf