]> err.no Git - yubikey-personalization.old/commitdiff
projects / yubikey-personalization.old / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72ce9c4 b58fef1)
Merge branch 'master' into debian yubikey-personalisation_1.3.1-1
authorTollef Fog Heen <tfheen@err.no>
Sat, 30 Jan 2010 12:52:39 +0000 (13:52 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sat, 30 Jan 2010 12:52:39 +0000 (13:52 +0100)

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