Merge branch 'gpg-libalpm-basics'
commitf7b577dc77667d8b7dc346e9754d9b203cc8068d
authorDan McGee <dan@archlinux.org>
Wed, 23 Mar 2011 07:34:51 +0000 (23 02:34 -0500)
committerDan McGee <dan@archlinux.org>
Wed, 23 Mar 2011 07:34:51 +0000 (23 02:34 -0500)
tree31a4505db608dac3d3aca97c8a300cb336ce69a7
parent8584c25903d72de7489733bbbf0c3dd21bbc81ac
parentcedc63375758cf1c2a821dd5a78d960b34b44f28
Merge branch 'gpg-libalpm-basics'
lib/libalpm/alpm.h