From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 17 Apr 2007 19:56:43 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0~86
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0a814175d5d4cebd2f2433603a7eba7cac496c0c;p=collectd.git

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

0a814175d5d4cebd2f2433603a7eba7cac496c0c