]> err.no Git - yubikey-personalization/commitdiff
projects / yubikey-personalization / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1480aa 13c87a3)
Merge branch 'devel/only_one_key' v1.11.2
authorKlas Lindfors <klas@yubico.com>
Wed, 9 Jan 2013 13:08:58 +0000 (14:08 +0100)
committerKlas Lindfors <klas@yubico.com>
Wed, 9 Jan 2013 13:08:58 +0000 (14:08 +0100)

Trivial merge