Merge branch 'feature/challenge-response'

author Fredrik Thulin <fredrik@yubico.com>

Tue, 8 Mar 2011 09:04:50 +0000 (10:04 +0100)

committer Fredrik Thulin <fredrik@yubico.com>

Tue, 8 Mar 2011 09:04:50 +0000 (10:04 +0100)
author Fredrik Thulin <fredrik@yubico.com>
Tue, 8 Mar 2011 09:04:50 +0000 (10:04 +0100)
committer Fredrik Thulin <fredrik@yubico.com>
Tue, 8 Mar 2011 09:04:50 +0000 (10:04 +0100)
diff --cc configure.ac
Simple merge
diff --cc ykpersonalize.1
Simple merge
author	Fredrik Thulin <fredrik@yubico.com>
	Tue, 8 Mar 2011 09:04:50 +0000 (10:04 +0100)
committer	Fredrik Thulin <fredrik@yubico.com>
	Tue, 8 Mar 2011 09:04:50 +0000 (10:04 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
ykpersonalize.1	patch \|	diff1 \|	diff2 \|	blob \| history