]> err.no Git - yubikey-personalization.old/commitdiff
projects / yubikey-personalization.old / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5427c71 65dc084)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Fri, 9 Dec 2011 21:57:08 +0000 (22:57 +0100)
committerTollef Fog Heen <tfheen@err.no>
Fri, 9 Dec 2011 21:57:08 +0000 (22:57 +0100)

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