Juergen Daubert 8d1e601f37 Merge branch '3.1' into 3.2 ...

Conflicts:
	btrfs-progs/.md5sum
	btrfs-progs/Pkgfile
	kmod/Pkgfile
	wget/Pkgfile

2015-11-18 20:02:27 +01:00

..

.footprint

Merge branch '3.1' into 3.2

2015-11-18 20:02:27 +01:00

.md5sum

kmod: update to 22

2015-11-18 19:54:32 +01:00

Pkgfile

Merge branch '3.1' into 3.2

2015-11-18 20:02:27 +01:00