]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52153f1 893d4a3)
Merge remote-tracking branch 'vuizook/master'
authorTollef Fog Heen <tfheen@err.no>
Fri, 25 Nov 2011 17:04:38 +0000 (18:04 +0100)
committerTollef Fog Heen <tfheen@err.no>
Fri, 25 Nov 2011 17:04:38 +0000 (18:04 +0100)

Trivial merge