From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 23 Mar 2010 21:05:41 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: yubikey-personalisation_1.3.2-1~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4ddb00e58f78f34a067929bc5f5a394f088d7cc;p=yubikey-personalization.old

Merge branch 'master' into debian
---

c4ddb00e58f78f34a067929bc5f5a394f088d7cc