From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 3 Apr 2007 07:04:17 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0-rc4~23^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f4c7c0019eee38dc9ca5dbb520e5c5d1b0e3ae8e;p=collectd.git

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

f4c7c0019eee38dc9ca5dbb520e5c5d1b0e3ae8e