]> git.proxmox.com Git - mirror_spl-debian.git/commit
Merge tag 'upstream/0.6.1'
authorAron Xu <aron@debian.org>
Mon, 8 Apr 2013 06:23:22 +0000 (14:23 +0800)
committerAron Xu <aron@debian.org>
Mon, 8 Apr 2013 06:23:22 +0000 (14:23 +0800)
commit7289309f6c176209a7afae72f931fbd9e72917ff
tree52232e57a62c79fbcd03b2aef4b8c7581ee97f3d
parent63dc177621dcaac032b46552f6a96b1d3477bbd8
parentd956cfacce07f9aad2da26c3ad8097dde03d19db
Merge tag 'upstream/0.6.1'

Upstream version 0.6.1

Conflicts:
.gitignore
README.markdown
rpm/fedora/spl-dkms.spec.in
rpm/fedora/spl.spec.in