]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f473ed5 670bdbc)
Merge branch 'devel/import_export' of github.com:Yubico/yubikey-personalization into...
authorSimon Josefsson <simon@josefsson.org>
Fri, 19 Apr 2013 13:09:17 +0000 (15:09 +0200)
committerSimon Josefsson <simon@josefsson.org>
Fri, 19 Apr 2013 13:09:17 +0000 (15:09 +0200)

Trivial merge