From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 11 Sep 2007 09:45:50 +0000 (+0200)
Subject: Merge branch 'uni/collectd-4.0' into collectd-4.0
X-Git-Tag: collectd-4.0.8~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3d6143a0148f877146aad330cec8d5578b774816;p=collectd.git

Merge branch 'uni/collectd-4.0' into collectd-4.0
---

3d6143a0148f877146aad330cec8d5578b774816