]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 9 Mar 2011 19:04:32 +0000 (20:04 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 9 Mar 2011 19:04:32 +0000 (20:04 +0100)
commit6037e444904abed35502cf1413c5ffbcba1d22f0
tree7d547cd39d16a059acd1b1bb50149cfc3826687a
parente3c5ff834acc95c8a99d8076f7c6845b757709dc
parentff5e984e7c4eb815aaa2521bc228507f639437e6
Merge branch 'master' into debian

Conflicts:
ykpersonalize.1
ykpersonalize.1