]> err.no Git - yubikey-personalization/commit
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)
commit17b011e25ea14883cebdf30823bbbb0a4ebb717c
tree83618509869999ff4bae4b5e1bea547f36dc575b
parentf473ed548436935ec56fbe6d4fa49037c12bce1d
parent670bdbcaa159cc0d6b1abb801c54f6b0d15c3ab6
Merge branch 'devel/import_export' of github.com:Yubico/yubikey-personalization into devel/import_export