]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e36dfc adeb4a0)
Merge branch 'master' of github.com:Yubico/yubikey-personalization
authorKlas Lindfors <klas@yubico.com>
Tue, 7 Aug 2012 06:24:43 +0000 (08:24 +0200)
committerKlas Lindfors <klas@yubico.com>
Tue, 7 Aug 2012 06:24:43 +0000 (08:24 +0200)

Trivial merge