]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff29911 021fa23)
Merge branch 'master' into debian
authorSimon Josefsson <simon@josefsson.org>
Wed, 3 Apr 2013 19:36:11 +0000 (21:36 +0200)
committerSimon Josefsson <simon@josefsson.org>
Wed, 3 Apr 2013 19:36:11 +0000 (21:36 +0200)

Trivial merge