]> err.no Git - yubikey-personalization.old/commitdiff
projects / yubikey-personalization.old / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a7f0e0 1a96540)
Merge remote branch 'origin/master' into debian
authorTollef Fog Heen <tfheen@err.no>
Fri, 31 Dec 2010 07:34:33 +0000 (08:34 +0100)
committerTollef Fog Heen <tfheen@err.no>
Fri, 31 Dec 2010 07:34:33 +0000 (08:34 +0100)

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