From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 27 Jan 2010 21:12:03 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e6934b235d7983e95da34f9f8075889c9e406c5;p=yubikey-server-c

Merge branch 'master' into debian
---

8e6934b235d7983e95da34f9f8075889c9e406c5