From: Florian Forster <octo@collectd.org>
Date: Tue, 4 Jun 2013 06:42:25 +0000 (+0200)
Subject: Merge branch 'xl/zfs'
X-Git-Tag: collectd-5.4.0~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74a553849b86a5efd040a7e980fce1145c8dc4c9;p=thirdparty%2Fcollectd.git

Merge branch 'xl/zfs'
---

74a553849b86a5efd040a7e980fce1145c8dc4c9