From: Florian Forster <octo@collectd.org>
Date: Fri, 23 Mar 2012 12:53:39 +0000 (+0100)
Subject: Merge branch 'ff/zfs'
X-Git-Tag: collectd-5.1.0~5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=dd1c15922789bf36693ed6fe5dad0135a8b3452a;p=collectd.git

Merge branch 'ff/zfs'
---

dd1c15922789bf36693ed6fe5dad0135a8b3452a