From: Tollef Fog Heen Date: Mon, 20 Feb 2012 21:14:11 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: yubikey-personalisation_1.6.4-1~6^2~1 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82602aa30f5d408dd5454bf0098303c4f3e94623;p=yubikey-personalization.old Merge remote-tracking branch 'origin/master' --- 82602aa30f5d408dd5454bf0098303c4f3e94623