Merge branch 'maint'
commit4758cfe33f9a8473312a9fee718c45bf72f555f5
authorDan McGee <dan@archlinux.org>
Fri, 29 Apr 2011 21:05:59 +0000 (29 16:05 -0500)
committerDan McGee <dan@archlinux.org>
Fri, 29 Apr 2011 21:05:59 +0000 (29 16:05 -0500)
tree098bd86df5e57037ac85f9882eac23c885b4e851
parent9c552272e83905703ad0cbcfc92883ebd1eff6f9
parentda24324e2dad434bc6d868d9815efc9c2517a769
Merge branch 'maint'
doc/pacman.8.txt