]> git.proxmox.com Git - mirror_zfs-debian.git/commit - lib/libshare/Makefile.in
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)
commit82f5395e27c435ad377c6e59a5db7b389f1031a0
tree897f35cdfbbe115822599dbde2c41dee5ff88814
parent97b5e46be82bb74df289cc330341f2e3103b997b
parent90bb749421cea1f34559e9e5148599f112580eb6
Merge tag 'upstream/0.6.1'

Upstream version 0.6.1

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