From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 18 Jan 2011 18:40:09 +0000 (+0100)
Subject: Merge commit 'v1.4.0'
X-Git-Tag: show~4^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b40a04c8177c35fff5505dc559fc34fadfd2594;p=yubikey-personalization.old

Merge commit 'v1.4.0'
---

7b40a04c8177c35fff5505dc559fc34fadfd2594