From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 30 Mar 2007 20:04:16 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0~117
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0352eb93e70fb471d4975823db38147d2661f4bf;p=collectd.git

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

0352eb93e70fb471d4975823db38147d2661f4bf