]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc4ac77 c868fef)
Merge branch 'private/testing+ndef'
authorKlas Lindfors <klas@yubico.com>
Thu, 10 May 2012 09:08:08 +0000 (11:08 +0200)
committerKlas Lindfors <klas@yubico.com>
Thu, 10 May 2012 09:08:08 +0000 (11:08 +0200)

Trivial merge