]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4542745 2745f1e)
Merge branch 'master' into debian
authorSimon Josefsson <simon@josefsson.org>
Fri, 12 Jul 2013 09:36:14 +0000 (11:36 +0200)
committerSimon Josefsson <simon@josefsson.org>
Fri, 12 Jul 2013 09:36:14 +0000 (11:36 +0200)

Trivial merge