Merge branch 'maint'
commit1d98c6347c9622d4334f80fc59623da524b4f37b
authorDan McGee <dan@archlinux.org>
Thu, 1 Dec 2011 04:34:25 +0000 (30 22:34 -0600)
committerDan McGee <dan@archlinux.org>
Thu, 1 Dec 2011 04:34:25 +0000 (30 22:34 -0600)
treeca1284032ee13c73a625f6261ac2bde2bfbc708e
parent86b5b7aa4215b7408ccf1ec8368988af327703fb
parent5490cd6eb22752d2eac5410152d239c50224dbc1
Merge branch 'maint'
lib/libalpm/util.c
scripts/makepkg.sh.in