Merge remote-tracking branch 'origin/master' into stablejenkins-build_Tails_ISO_stable-6
commit2efd56e24039af56b72f2d79f1be783f9345858f
authorTails developers <amnesia@boum.org>
Wed, 26 Jun 2013 15:19:49 +0000 (26 15:19 +0000)
committerTails developers <amnesia@boum.org>
Wed, 26 Jun 2013 15:19:49 +0000 (26 17:19 +0200)
treefcdc30b38e241a250defaf15fc087d5cd66a7dbc
parent67eae7cf58191e6546f42cce3c15f5b3b7c1e731
parent99e1738d7c6a6f5c0d91b0e3369e7695485b650b
Merge remote-tracking branch 'origin/master' into stable