ports/core (3.2): Merge branch '3.1' into 3.2

2 Nov 2015


      commit 0ac71eda604c38eb42cc5d9c01b7144d3f4ffffd
Merge: 5c129eb 3d4551b
Author: Juergen Daubert <jue@jue.li>
Date:   Mon Nov 2 22:30:31 2015 +0100

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

crux＠crux.nu

tags

participants (1)