[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-619-gcd759b1

[Aron Xu]

The following commit has been merged in the master branch:
commit cd759b1f5dc508a53295ffaeb5f53d0066ff7411
Merge: e87e98663760ad8b9f3aa8166f29eb0adbb00b61 1bb9c3bf8ccd0c9c21de3282f8671727bd654509
Author: Aron Xu <aron at debian.org>
Date:   Sun Nov 1 12:47:33 2015 +0800

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-zfsonlinux/zfs
    
    Conflicts:
    	debian/control
    	debian/control.in


-- 
ZFS on Linux