]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb13e47 516f6de)
Merge branch 'master' of github.com:Yubico/yubikey-personalization
authorFredrik Thulin <fredrik@yubico.com>
Mon, 17 Jan 2011 15:32:25 +0000 (16:32 +0100)
committerFredrik Thulin <fredrik@yubico.com>
Mon, 17 Jan 2011 15:32:25 +0000 (16:32 +0100)

Trivial merge