From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 23 Sep 2007 13:14:36 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.1' into collectd-4.1
X-Git-Tag: collectd-4.1.2~3
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=f01e1bf6391584c4bec473ba37197b2cbd8f146f;p=collectd.git

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

f01e1bf6391584c4bec473ba37197b2cbd8f146f