From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 31 May 2012 21:18:01 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: yubikey-personalisation_1.6.4-1~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=282335e8929a221d308898fd4cc5c04a5d86a39d;p=yubikey-personalization.old

Merge branch 'master' into debian
---

282335e8929a221d308898fd4cc5c04a5d86a39d