]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fedccb3 f7818f7)
Merge branch 'master' into debian
authorSimon Josefsson <simon@josefsson.org>
Mon, 22 Apr 2013 11:49:39 +0000 (13:49 +0200)
committerSimon Josefsson <simon@josefsson.org>
Mon, 22 Apr 2013 11:49:39 +0000 (13:49 +0200)

Trivial merge