From: Tollef Fog Heen Date: Fri, 31 Dec 2010 08:11:30 +0000 (+0100) Subject: Merge remote branch 'origin/master' X-Git-Tag: yubikey-personalisation_1.3.5-1~3^2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=209adb43e1519737ec7d0c4aa39c108e3e37ea11;p=yubikey-personalization.old Merge remote branch 'origin/master' --- 209adb43e1519737ec7d0c4aa39c108e3e37ea11