From: Klas Lindfors <klas@yubico.com>
Date: Wed, 11 Apr 2012 08:43:09 +0000 (+0200)
Subject: Merge branch 'private/testing' into private/testing+ndef
X-Git-Tag: v1.7.0~1^2~38
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=486314f8c3f24df163519d73cb2aea235bef58f4;p=yubikey-personalization

Merge branch 'private/testing' into private/testing+ndef
---

486314f8c3f24df163519d73cb2aea235bef58f4