Merge branch 'v2'
commitcee4a88f614daca44f3e4dab7439c79ecd5d180c
authorBen Kibbey <bjk@luxsci.net>
Sat, 22 Nov 2008 23:37:19 +0000 (22 18:37 -0500)
committerBen Kibbey <bjk@luxsci.net>
Sat, 22 Nov 2008 23:37:19 +0000 (22 18:37 -0500)
tree08798bd1da1160237b7608b81a73ff633e32de66
parentb09992d61687b9c7e1c67058d414f1fa92ab8ca5
parent537b19a0f5d5a99d18ade6b550e3590da6e7b9b8
Merge branch 'v2'
configure.ac
doc/pwmd.1.in
src/pinentry.c