From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 16 Apr 2007 12:53:12 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0-rc4~1^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=967ca89616bf9ccf246eeacf53fc84eb70743386;p=collectd.git

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

967ca89616bf9ccf246eeacf53fc84eb70743386