Merge branch 'maint'
commit96b3ba3470f11842312e4fdb34b74b391842fc33
authorDan McGee <dan@archlinux.org>
Mon, 21 Nov 2011 03:40:50 +0000 (20 21:40 -0600)
committerDan McGee <dan@archlinux.org>
Mon, 21 Nov 2011 03:40:50 +0000 (20 21:40 -0600)
tree5c60dff639bfa7f8f674e995ecbab4f7fc07064a
parent2141b7112d237221280781bed2b2bb6efadc963e
parent507a2d15e65aba93a20ee99d90345917866407dc
Merge branch 'maint'
scripts/makepkg.sh.in