]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb0ade8 c766890)
Merge branch 'master' into debian
authorSimon Josefsson <simon@josefsson.org>
Mon, 16 Sep 2013 09:48:06 +0000 (11:48 +0200)
committerSimon Josefsson <simon@josefsson.org>
Mon, 16 Sep 2013 09:48:06 +0000 (11:48 +0200)

Trivial merge