]> err.no Git - yubikey-personalization/commit
Merge branch 'private/testing+ndef'
authorKlas Lindfors <klas@yubico.com>
Thu, 7 Jun 2012 11:14:25 +0000 (13:14 +0200)
committerKlas Lindfors <klas@yubico.com>
Thu, 7 Jun 2012 11:14:25 +0000 (13:14 +0200)
commit4c558e9b9c6b8e90fa3cf08f1cfb1a226f5b7f98
tree78e07cf8b8f9fe5edbd52be5fd1dda9d7be68b7f
parent7b9ae18c4e64544c1c9768a968216a1cc818b918
parent850bcdbf46b7e15ed56e082962c9a659256e3e52
Merge branch 'private/testing+ndef'

Conflicts:
NEWS
configure.ac
tests/Makefile.am
NEWS
tests/Makefile.am