]> err.no Git - yubikey-server-c/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Thu, 22 Oct 2009 20:27:14 +0000 (22:27 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 22 Oct 2009 20:27:14 +0000 (22:27 +0200)
commitb777d6318ad78c5f74c8786ed4897c98427a5184
tree34281d83642ce8c2ec9cb5a6d2fe858760c0dc25
parent59de5b7d4edda6b0ea8b03e06a95c8cc06857b53
parent78ad2d89c4ab4a36b348634005745402a2acd1c4
Merge branch 'master' into debian