]> err.no Git - yubikey-personalization.old/commitdiff
projects / yubikey-personalization.old / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 491b2e9 a0a1e91)
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Thu, 31 May 2012 21:18:01 +0000 (23:18 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 31 May 2012 21:18:01 +0000 (23:18 +0200)

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