]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65dc084 142cb6f)
Merge remote-tracking branch 'origin/master'
authorTollef Fog Heen <tfheen@err.no>
Mon, 20 Feb 2012 21:14:11 +0000 (22:14 +0100)
committerTollef Fog Heen <tfheen@err.no>
Mon, 20 Feb 2012 21:14:11 +0000 (22:14 +0100)

Trivial merge