]> err.no Git - yubikey-personalization.old/commitdiff
projects / yubikey-personalization.old / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1c9467 e970334)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 19 Jan 2011 20:00:44 +0000 (21:00 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 19 Jan 2011 20:00:44 +0000 (21:00 +0100)

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