Juergen Daubert 24748ba1d4 Merge branch '3.1' into 3.2 ... Conflicts: btrfs-progs/.md5sum btrfs-progs/Pkgfile curl/.footprint vim/Pkgfile		2015-10-09 09:49:35 +02:00
..
.footprint	Merge branch '3.1' into 3.2	2015-10-09 09:49:35 +02:00
.md5sum	vim: update to 7.4.890	2015-10-07 11:22:43 +02:00
Pkgfile	Merge branch '3.1' into 3.2	2015-10-09 09:49:35 +02:00