From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 26 Aug 2011 06:10:16 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: yubikey-personalisation_1.6.1-1~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ce5148a1097ee986b7347e9e140017672d8bf06;p=yubikey-personalization.old

Merge branch 'master' into debian

Conflicts:
	Makefile.am
	configure.ac
---

4ce5148a1097ee986b7347e9e140017672d8bf06