Merge branch 'maint'
commitbfc024eab3a1d26ba37620175be815cb2eb59606
authorDan McGee <dan@archlinux.org>
Fri, 8 Feb 2008 02:16:16 +0000 (7 20:16 -0600)
committerDan McGee <dan@archlinux.org>
Fri, 8 Feb 2008 02:16:16 +0000 (7 20:16 -0600)
tree96c1c3d89b0e523364b6b000ef02105ebbd0923e
parent77c3cf9790472592902183354ea5481cffc01f58
parent14ee1be1ef21e09a84f01dc9623e8513218709d4
Merge branch 'maint'
lib/libalpm/add.c