]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf28714 0ff85de)
Merge remote branch 'remotes/origin/feature/windows-backend'
authorSimon Josefsson <simon@josefsson.org>
Mon, 11 Apr 2011 12:01:58 +0000 (14:01 +0200)
committerSimon Josefsson <simon@josefsson.org>
Mon, 11 Apr 2011 12:01:58 +0000 (14:01 +0200)

Trivial merge