Dan McGee 8fa330335f Merge branch 'maint' ...

Conflicts:
	lib/libalpm/dload.c
	lib/libalpm/po/fi.po
	lib/libalpm/po/libalpm.pot
	po/de.po
	po/fi.po
	src/pacman/po/pacman.pot
	src/pacman/util.c

2011-08-08 17:05:25 -05:00

..

libalpm

Merge branch 'maint'

2011-08-08 17:05:25 -05:00