]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 209adb4 049e6d3)
Merge commit 'v1.4.0'
authorTollef Fog Heen <tfheen@err.no>
Tue, 18 Jan 2011 18:40:09 +0000 (19:40 +0100)
committerTollef Fog Heen <tfheen@err.no>
Tue, 18 Jan 2011 18:40:09 +0000 (19:40 +0100)

Trivial merge