Merge branch 'maint'
commit2a4df070c360bfe31d99e232b75bdea06949245f
authorDan McGee <dan@archlinux.org>
Mon, 12 Dec 2011 20:07:44 +0000 (12 14:07 -0600)
committerDan McGee <dan@archlinux.org>
Mon, 12 Dec 2011 20:07:44 +0000 (12 14:07 -0600)
treebf67ebb0f50bfe5be5f231a642deb64c5b116cdb
parent370c873be54a6ef74f86b5e77ff722f766ebf707
parent67290441b80fa813a472767353095425c78805af
Merge branch 'maint'
contrib/Makefile.am
contrib/paccache.in