]> err.no Git - yubikey-server-c/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sun, 27 Dec 2009 11:12:10 +0000 (12:12 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sun, 27 Dec 2009 11:12:10 +0000 (12:12 +0100)
commit305df8fe273c55d2d6a5b39e5e9ead85cb081320
tree5e306e7bc5165e62a0c563120e9b419fa656fdbb
parentb5850496a5b92b65f0b79d90250f194ada5d0ac1
parent58ecf486b6cd65ab2fea53ff205b63935165bbc9
Merge branch 'master' into debian