]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Tue, 18 Jan 2011 18:42:01 +0000 (19:42 +0100)
committerTollef Fog Heen <tfheen@err.no>
Tue, 18 Jan 2011 18:42:01 +0000 (19:42 +0100)
commita7bcfa1329314129935b07bdc8400a8dac04ee70
tree9e9941af708cc36ac5287f4673e432cc03d3e43f
parent75f9e736b4cab9b3a232f2807854f4923f3a5e60
parent7b40a04c8177c35fff5505dc559fc34fadfd2594
Merge branch 'master' into debian

Conflicts:
ykpersonalize.1
ykpersonalize.1