]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d4c9db e61e485)
Merge branch into devel/import_export
authorKlas Lindfors <klas@yubico.com>
Fri, 19 Apr 2013 09:31:00 +0000 (11:31 +0200)
committerKlas Lindfors <klas@yubico.com>
Fri, 19 Apr 2013 09:31:00 +0000 (11:31 +0200)

Trivial merge