]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Thu, 31 May 2012 21:18:01 +0000 (23:18 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 31 May 2012 21:18:01 +0000 (23:18 +0200)
commit282335e8929a221d308898fd4cc5c04a5d86a39d
tree2e3a66483ffefa00b857752404988314311abad3
parent491b2e9b2ba9186675a75aecd481b88a5a0c6bf1
parenta0a1e91597bac2683be1a4442177cf098e166465
Merge branch 'master' into debian