]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 436aee5 43a746f)
Merge tag 'v1.15.1' master
authorSimon Josefsson <simon@josefsson.org>
Wed, 12 Mar 2014 11:50:43 +0000 (12:50 +0100)
committerSimon Josefsson <simon@josefsson.org>
Wed, 12 Mar 2014 11:50:43 +0000 (12:50 +0100)
1.15.1


Trivial merge