From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 28 Sep 2007 10:19:19 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.1' into collectd-4.1
X-Git-Tag: collectd-4.1.2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=51ed8fc1a698fbfd1d557d7615228c32dcbc2105;p=collectd.git

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

51ed8fc1a698fbfd1d557d7615228c32dcbc2105