From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 12 Mar 2011 14:41:29 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: yubikey-personalisation_1.5.1-1~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af56213b36404eafbd86baefbe97bad04656116a;p=yubikey-personalization.old

Merge branch 'master' into debian

Conflicts:
	ykpersonalize.1
---

af56213b36404eafbd86baefbe97bad04656116a