Checkout
C. Michael Pilato
committed
on 13 Aug 12
On the '1.7.x-r1242759' branch: merge from trunk r1242759, r1242770, and
r1242794, resolving the conflict caused by gpg_agent.c not existing… Show more
On the '1.7.x-r1242759' branch: merge from trunk r1242759, r1242770, and

r1242794, resolving the conflict caused by gpg_agent.c not existing in

the 1.7.x history. Show less