]> err.no Git - yubikey-server-c/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 27 Jan 2010 21:12:03 +0000 (22:12 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 27 Jan 2010 21:12:03 +0000 (22:12 +0100)
commit8e6934b235d7983e95da34f9f8075889c9e406c5
tree1115c3ff6b182ddd4431258d66cab9062f5b083e
parentb1d21675d36f27d3d29e68f7aeb8e97e6328d9d7
parent6fc45a5cb0b16fb393eddf31d54d3c33737a6dc9
Merge branch 'master' into debian