Juergen Daubert 4002cd986a Merge branch '3.1' into 3.2
Conflicts:
	cpio/Pkgfile
	file/Pkgfile
	pciutils/Pkgfile
2015-09-24 15:12:53 +02:00
..
2015-09-24 14:47:36 +02:00
2015-09-24 15:12:53 +02:00