]> err.no Git - yubikey-personalization.old/commitdiff
projects / yubikey-personalization.old / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c995121 05bf835)
Merge commit 'v1.6.3' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 21 Dec 2011 15:19:37 +0000 (16:19 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 21 Dec 2011 15:19:37 +0000 (16:19 +0100)
Conflicts:
ykpersonalize.1


Trivial merge
Unnamed repository; edit this file to name it for gitweb.