Juergen Daubert 0db6b968f9 Merge branch '3.1' into 3.2 ... Conflicts: btrfs-progs/.footprint btrfs-progs/.md5sum btrfs-progs/Pkgfile pkg-config/Pkgfile unzip/.md5sum unzip/Pkgfile xz/Pkgfile		2015-10-05 20:52:48 +02:00
..
.footprint	Merge branch '3.1' into 3.2	2015-10-05 20:52:48 +02:00
.md5sum	xz: update to 5.2.2	2015-10-02 11:02:11 +02:00
Pkgfile	Merge branch '3.1' into 3.2	2015-10-05 20:52:48 +02:00