]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian yubikey-personalisation_1.3.1-1
authorTollef Fog Heen <tfheen@err.no>
Sat, 30 Jan 2010 12:52:39 +0000 (13:52 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sat, 30 Jan 2010 12:52:39 +0000 (13:52 +0100)
commit2a1662d23604a16560aee58f19ce8faead7e29c1
treee3a89d2a30cfa8a75970a76670ac89fe52820c49
parent72ce9c487faecd7570beb52ec9dbbd8f40b0c83c
parentb58fef1e097601ad835307580cdf56582780aa70
Merge branch 'master' into debian