[crux-commits] ports/core (3.2): Merge branch '3.1' into 3.2

18 Nov 2015


      commit 8d1e601f371a93cb466b7593a21fd5269a99832d
Merge: 8ac5de3 7e6706c
Author: Juergen Daubert <jue@jue.li>
Date:   Wed Nov 18 20:02:27 2015 +0100

    Merge branch '3.1' into 3.2
    
     Conflicts:
    	btrfs-progs/.md5sum
    	btrfs-progs/Pkgfile
    	kmod/Pkgfile
    	wget/Pkgfile

[crux-commits] ports/core (3.2): Merge branch '3.1' into 3.2

crux＠crux.nu