Merge branch 'xl/zfs'
authorFlorian Forster <octo@collectd.org>
Tue, 4 Jun 2013 06:42:25 +0000 (08:42 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 4 Jun 2013 06:42:25 +0000 (08:42 +0200)

Trivial merge