]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8523c6f 51698c9)
Merge branch 'master' into devel/windows_for_travis
authorKlas Lindfors <klas@yubico.com>
Thu, 20 Sep 2012 09:24:37 +0000 (11:24 +0200)
committerKlas Lindfors <klas@yubico.com>
Thu, 20 Sep 2012 09:24:37 +0000 (11:24 +0200)

Trivial merge