]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sat, 12 Mar 2011 14:41:29 +0000 (15:41 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sat, 12 Mar 2011 14:41:29 +0000 (15:41 +0100)
commitaf56213b36404eafbd86baefbe97bad04656116a
tree00a83f1b2d2d3745e8e67864e8cb2a76595ccd39
parentf94fd3ecb623f0ecfc2f7cb5c59ff6d65bae64ab
parent3f60622e54c2faf8d83f84efc36c1113c6678db6
Merge branch 'master' into debian

Conflicts:
ykpersonalize.1
ykpersonalize.1