Merge branch 'maint'
commit41da2253366b6f641fc3e986817ee617c9e18df3
authorDan McGee <dan@archlinux.org>
Wed, 1 Jun 2011 17:13:49 +0000 (1 12:13 -0500)
committerDan McGee <dan@archlinux.org>
Wed, 1 Jun 2011 17:13:49 +0000 (1 12:13 -0500)
treec0ef91021a88bd663905a170087a7cbfec874436
parentfe9804a96d9e50a44e549c7be9189152e20893c5
parentaad57cc06ac60dc8fdcff9bea811e990d64f74d3
Merge branch 'maint'
doc/Makefile.am
doc/makepkg.8.txt
doc/pacman.8.txt
doc/pacman.conf.5.txt
lib/libalpm/alpm_list.c
lib/libalpm/handle.c
lib/libalpm/trans.c