Dan McGee efd8ae483f Merge branch 'maint' ... Conflicts: lib/libalpm/alpm.h lib/libalpm/trans.c Signed-off-by: Dan McGee <dan@archlinux.org>		2011-04-15 18:41:49 -05:00
..
libalpm	Merge branch 'maint'	2011-04-15 18:41:49 -05:00