From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 21 Dec 2011 15:19:37 +0000 (+0100)
Subject: Merge commit 'v1.6.3' into debian
X-Git-Tag: yubikey-personalisation_1.6.3-1~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=985b3c988d92cb01ee6dece8caec6c4a5d557ba6;p=yubikey-personalization.old

Merge commit 'v1.6.3' into debian

Conflicts:
	ykpersonalize.1
---

985b3c988d92cb01ee6dece8caec6c4a5d557ba6