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

Trivial merge