Dan McGee 9d73b261cf Merge branch 'maint' ... Conflicts: src/pacman/callback.c		2011-06-02 17:34:12 -05:00
..
pacman	Merge branch 'maint'	2011-06-02 17:34:12 -05:00
util	pactree: make -Wwrite-strings friendly	2011-05-04 15:49:47 -05:00