]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Fri, 31 Dec 2010 08:12:38 +0000 (09:12 +0100)
committerTollef Fog Heen <tfheen@err.no>
Fri, 31 Dec 2010 08:12:38 +0000 (09:12 +0100)
commita59d7c226f0cdf6f1e9f3812cca9d5ab694fe5f4
tree4441c9d55c3035e00474d1a3d71bbcb54cee9463
parenta1745995c5c0a1cf36a77bb4e688bd67a89c6da3
parent209adb43e1519737ec7d0c4aa39c108e3e37ea11
Merge branch 'master' into debian