From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 11 Apr 2011 12:01:58 +0000 (+0200)
Subject: Merge remote branch 'remotes/origin/feature/windows-backend'
X-Git-Tag: v1.5.1~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4012ff276e45448db76b45fedf26d12f74661a2c;p=yubikey-personalization

Merge remote branch 'remotes/origin/feature/windows-backend'
---

4012ff276e45448db76b45fedf26d12f74661a2c