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

20 Nov 2015


      commit f9c311c7652d5746643aa8220ae7d3682e694851
Merge: 8d1e601 9bd4492
Author: Juergen Daubert <jue@jue.li>
Date:   Fri Nov 20 15:58:14 2015 +0100

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

crux＠crux.nu

tags

participants (1)