]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Tue, 23 Mar 2010 21:05:41 +0000 (22:05 +0100)
committerTollef Fog Heen <tfheen@err.no>
Tue, 23 Mar 2010 21:05:41 +0000 (22:05 +0100)
commitc4ddb00e58f78f34a067929bc5f5a394f088d7cc
tree407293e93af018bd5f91d6fb3411b20e537032af
parent2a1662d23604a16560aee58f19ce8faead7e29c1
parent884e21f6fc96eb72d3e1b643086bb0737dfcc931
Merge branch 'master' into debian