]> err.no Git - yubikey-personalization.old/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Tue, 23 Mar 2010 21:18:02 +0000 (22:18 +0100)
committerTollef Fog Heen <tfheen@err.no>
Tue, 23 Mar 2010 21:18:02 +0000 (22:18 +0100)
commit4766932abd48a3fd120fb7cf7adda15ccb5e57ee
tree60e4da63106db8ab752ffe9ba7e89b15e7e4edc0
parentc4ddb00e58f78f34a067929bc5f5a394f088d7cc
parentdcdbf0fe989b162d4bc5273eac65b8532e68445d
Merge branch 'master' into debian