]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Fri, 31 Dec 2010 07:30:28 +0000 (08:30 +0100)
committerTollef Fog Heen <tfheen@err.no>
Fri, 31 Dec 2010 07:30:28 +0000 (08:30 +0100)
commit1a7f0e089ab4bc3e7c842d50171fb55fa787e0ab
tree4441c9d55c3035e00474d1a3d71bbcb54cee9463
parentd92eddcbe9422ee71bf5850fb59dde4ee46337b1
parentca1d3ba0fc48a0450f76a510b3061684e8a2d884
Merge branch 'master' into debian