]> 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: 97b5e46 90bb749)
Merge tag 'upstream/0.6.1'
authorAron Xu <aron@debian.org>
Mon, 8 Apr 2013 06:40:43 +0000 (14:40 +0800)
committerAron Xu <aron@debian.org>
Mon, 8 Apr 2013 06:40:43 +0000 (14:40 +0800)
Upstream version 0.6.1

Conflicts:
.gitignore
rpm/fedora/zfs-dkms.spec.in
rpm/fedora/zfs.spec.in


Trivial merge
Mirror of ZFSOnLinux for Debian