From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Wed, 31 Jan 2007 12:48:21 +0000 (+0100)
Subject: Merge branch 'pull/collectd-4'
X-Git-Tag: collectd-4.0.0-rc4~126
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a3fe18a43186fd295346d023f1ef174566f5708f;p=collectd.git

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

a3fe18a43186fd295346d023f1ef174566f5708f