Dan McGee 4f02b98338 Merge branch 'maint' ... Conflicts: lib/libalpm/signing.c Signed-off-by: Dan McGee <dan@archlinux.org>		2012-01-08 12:14:04 -06:00
..
pacman	Merge branch 'maint'	2012-01-08 12:14:04 -06:00
util	testdb: check local database for duplicate files	2012-01-07 11:28:37 -06:00