From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 10 Mar 2007 09:52:02 +0000 (+0100)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0~161
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d246967f9483c508549f1723ec977cc8a19dbd4c;p=collectd.git

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

d246967f9483c508549f1723ec977cc8a19dbd4c