]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
Merge commit 'zfs-0.6.0-rc5'
authorDarik Horn <dajhorn@vanadac.com>
Wed, 13 Jul 2011 00:30:56 +0000 (19:30 -0500)
committerDarik Horn <dajhorn@vanadac.com>
Wed, 13 Jul 2011 00:30:56 +0000 (19:30 -0500)

Trivial merge