Merge branch 'devel' into testing
commit3b832d8d533325fc43aa1579b11817daf98514e1
authorTails developers <amnesia@boum.org>
Thu, 17 Oct 2013 11:57:25 +0000 (17 11:57 +0000)
committerTails developers <amnesia@boum.org>
Thu, 17 Oct 2013 11:57:25 +0000 (17 11:57 +0000)
treef00a81277cbf4c2edbebb7f53997a4672ff74e14
parent7ec421069a832b4a974e9d42b5707f3f3ed26bc4
parent4870ce3c9c6b23f5fff54c53a0b4b1d3c6012151
Merge branch 'devel' into testing