Dan McGee fbb44a6e0d Merge branch 'maint' ... Conflicts: doc/makepkg.conf.5.txt		2011-06-14 08:29:39 -05:00
..
pacman	Merge branch 'maint'	2011-06-14 08:29:39 -05:00
util	Move pm_errno onto the handle	2011-06-13 19:38:38 -05:00