From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 1 Nov 2007 09:07:03 +0000 (+0100)
Subject: Merge branch 'pull/collectd-4.1' into collectd-4.1
X-Git-Tag: collectd-4.1.4~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=96a9cd4acc079a5d070db9d83e80f551afeda4e8;p=collectd.git

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

96a9cd4acc079a5d070db9d83e80f551afeda4e8