]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12b0783 ba942f2)
Merge branch 'master' into debian
authorSimon Josefsson <simon@josefsson.org>
Wed, 12 Mar 2014 11:50:54 +0000 (12:50 +0100)
committerSimon Josefsson <simon@josefsson.org>
Wed, 12 Mar 2014 11:50:54 +0000 (12:50 +0100)

Trivial merge