Dan McGee e41ca0f2f6 Merge branch 'maint' ... Conflicts: etc/makepkg.conf.in		2012-07-10 08:41:18 -05:00
..
pacman	Merge branch 'maint'	2012-07-10 08:41:18 -05:00
scripts	Scripts testsuite output consistency	2012-06-25 23:39:52 -05:00
util	Format pacsort and vercmp testsuite output	2011-10-07 09:21:58 -05:00