]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b40a04 ed8f127)
Merge commit 'v1.4.1'
authorTollef Fog Heen <tfheen@err.no>
Wed, 19 Jan 2011 19:59:21 +0000 (20:59 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 19 Jan 2011 19:59:21 +0000 (20:59 +0100)

Trivial merge