Merge branch 'master' of ssh://playfair.gnupg.org/git/pinentry-qt
authorWerner Koch <wk@gnupg.org>
Tue, 22 Jun 2010 11:14:54 +0000 (13:14 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 22 Jun 2010 11:14:54 +0000 (13:14 +0200)
commit6f6238f3977b13ec50cf172c9890b0eb765708f7
tree59806db48d3af5d496f30ee997bc646ceff42f68
parentfdca675c4512adf32e625228cc0e91031a78cea9
parent0c617bc7b2e7407c210a1728318c83fdb6b9ed5a
Merge branch 'master' of ssh://playfair.gnupg.org/git/pinentry-qt

Conflicts:
ChangeLog
ChangeLog