]> err.no Git - yubikey-server-c/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 27 Jan 2010 21:06:48 +0000 (22:06 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 27 Jan 2010 21:06:48 +0000 (22:06 +0100)
commitb1d21675d36f27d3d29e68f7aeb8e97e6328d9d7
treea493884a0944e7b093124258708d66c3e95dbcec
parent98c6f86138964fc2f2bcc917bcb39215f43864e0
parent135a3e666d22523552420239c6037df0ba0c5eb9
Merge branch 'master' into debian