]> err.no Git - yubikey-personalization.old/commit
Merge commit 'v1.6.3' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 21 Dec 2011 15:19:37 +0000 (16:19 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 21 Dec 2011 15:19:37 +0000 (16:19 +0100)
commit985b3c988d92cb01ee6dece8caec6c4a5d557ba6
tree840cc6f32277fdd124d52fe1c8ae05484353dfe1
parentc9951219be7f048adea92d5b58690ad8672e3d07
parent05bf835aa9b38e9582be2712e5d3bc44f0322ce1
Merge commit 'v1.6.3' into debian

Conflicts:
ykpersonalize.1