From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 17 May 2007 10:36:12 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0~42
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=348fa70f34d7e32fafebb82053e0c84625c2ba67

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

348fa70f34d7e32fafebb82053e0c84625c2ba67