]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
Merge tag 'upstream/0.6.5.5'
authorAron Xu <aron@debian.org>
Sun, 20 Mar 2016 14:56:50 +0000 (22:56 +0800)
committerAron Xu <aron@debian.org>
Sun, 20 Mar 2016 14:56:50 +0000 (22:56 +0800)
Upstream version 0.6.5.5


Trivial merge