]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
projects / mirror_zfs-debian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b881ad5 8db77dd)
Merge commit 'upstream/0.6.0.12.rc4'
authorDarik Horn <dajhorn@vanadac.com>
Thu, 5 May 2011 15:15:24 +0000 (10:15 -0500)
committerDarik Horn <dajhorn@vanadac.com>
Thu, 5 May 2011 15:15:24 +0000 (10:15 -0500)

Trivial merge
Mirror of ZFSOnLinux for Debian