Merge branch 'maint'
commit96a1255eadd8b1faaffbfc2e9bdb1aa5e46ee04c
authorDan McGee <dan@archlinux.org>
Wed, 30 Jun 2010 13:41:43 +0000 (30 08:41 -0500)
committerDan McGee <dan@archlinux.org>
Wed, 30 Jun 2010 13:41:43 +0000 (30 08:41 -0500)
tree84976f108b049a1f47ed815d1c8156e53bac26f6
parentc11bf581a33babdbdf7b769567415b1faf1c4219
parent0ea52e3a4f698ce3b1c90881a2b2eaa56625f261
Merge branch 'maint'
scripts/makepkg.sh.in