]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5f4d51 fd786e3)
Merge branch 'master' of https://github.com/couchand/yubikey-personalization
authorKlas Lindfors <klas@yubico.com>
Thu, 31 Jan 2013 06:56:50 +0000 (07:56 +0100)
committerKlas Lindfors <klas@yubico.com>
Thu, 31 Jan 2013 06:56:50 +0000 (07:56 +0100)

Trivial merge