From: Fredrik Thulin <fredrik@yubico.com>
Date: Tue, 8 Mar 2011 09:04:50 +0000 (+0100)
Subject: Merge branch 'feature/challenge-response'
X-Git-Tag: v1.5.0~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0e4b57de5d716908643b9fac7fa82f38d20ea81;p=yubikey-personalization

Merge branch 'feature/challenge-response'

Conflicts:
	ykcore/ykcore.h
---

f0e4b57de5d716908643b9fac7fa82f38d20ea81