Merge branch 'master' into stable0.10.2
commitd3536380e524dcdf7205e4cd97d17bef04cb9307
authorTails developers <amnesia@boum.org>
Mon, 5 Mar 2012 10:31:50 +0000 (5 11:31 +0100)
committerTails developers <amnesia@boum.org>
Mon, 5 Mar 2012 10:31:50 +0000 (5 11:31 +0100)
tree7f8405e3e85d2c1eb1ddb6874bc7ba54fa988dc8
parenta2504359316c979cbe73c5ee55e1a1b931670ff1
parent7a7c136a293642710b9e07a149c853396e15e484
Merge branch 'master' into stable