]> git.proxmox.com Git - mirror_spl-debian.git/commitdiff
projects / mirror_spl-debian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63dc177 d956cfa)
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)
Upstream version 0.6.1

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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.