]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51ef1fe 436aee5)
Merge branch 'master' into debian
authorSimon Josefsson <simon@josefsson.org>
Mon, 27 Jan 2014 10:59:44 +0000 (11:59 +0100)
committerSimon Josefsson <simon@josefsson.org>
Mon, 27 Jan 2014 10:59:44 +0000 (11:59 +0100)

Trivial merge