]> 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: 6ba3476 8095473)
Merge tag 'upstream/0.6.5.2'
authorAron Xu <aron@debian.org>
Tue, 13 Oct 2015 14:26:16 +0000 (15:26 +0100)
committerAron Xu <aron@debian.org>
Tue, 13 Oct 2015 14:26:16 +0000 (15:26 +0100)
Upstream version 0.6.5.2

Conflicts:
META
configure
rpm/generic/spl-kmod.spec.in
rpm/generic/spl.spec.in
rpm/redhat/spl.spec.in


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