Merge branch 'bugfix/7657-fix-security-check' into stable
commite0af23237617b38410625cdb0850ac68a1cdc5c2
authorTails developers <amnesia@boum.org>
Sun, 10 Aug 2014 18:38:38 +0000 (10 20:38 +0200)
committerTails developers <amnesia@boum.org>
Sun, 10 Aug 2014 18:38:38 +0000 (10 20:38 +0200)
treec60fdc45a4de26cf8999d9bfc4cf67aadc0e0a36
parent0a1bca61b8d151e7dea19bfd643896111b824ee7
parent7ad84773fc635b664e24121dd7e2010ce65217ed
Merge branch 'bugfix/7657-fix-security-check' into stable