From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 10 May 2007 07:51:04 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0~46
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=abf77d54fe3d48f848679a99dc3dbd75c6766a38;p=collectd.git

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

abf77d54fe3d48f848679a99dc3dbd75c6766a38