Merge branch 'maint'
commit0c95b294e9c7b947e19eda71aca3aaffc9cc3abd
authorDan McGee <dan@archlinux.org>
Wed, 8 Aug 2012 01:54:59 +0000 (7 20:54 -0500)
committerDan McGee <dan@archlinux.org>
Wed, 8 Aug 2012 01:54:59 +0000 (7 20:54 -0500)
treeee42a93b91004f0fe3fe346b004b65815d1a082d
parent8853a6f2827739120057d4eda56a12bd3474e4c6
parentc9b31ad6220e7706caf0bad55355957bfcd041cb
Merge branch 'maint'
lib/libalpm/sync.c