From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 28 Sep 2009 12:43:37 +0000 (+0200)
Subject: Merge remote branch 'trenkel/st/netapp' into st/netapp
X-Git-Tag: collectd-4.9.0~73^2~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a7c078d1df0241cd6ede811877a4259cc36932e;p=collectd.git

Merge remote branch 'trenkel/st/netapp' into st/netapp
---

4a7c078d1df0241cd6ede811877a4259cc36932e