]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34c534d e777db1)
Merge branch 'master' of https://github.com/Detegr/yubikey-personalization
authorKlas Lindfors <klas@yubico.com>
Mon, 3 Mar 2014 12:55:30 +0000 (13:55 +0100)
committerKlas Lindfors <klas@yubico.com>
Mon, 3 Mar 2014 12:55:30 +0000 (13:55 +0100)

Trivial merge