Merge remote-tracking branch 'origin/master' into stable
commit69112276a3605ff7b90c4111dc2a93d37f1736ae
authorTails developers <amnesia@boum.org>
Sun, 2 Feb 2014 10:29:03 +0000 (2 10:29 +0000)
committerTails developers <amnesia@boum.org>
Sun, 2 Feb 2014 10:29:03 +0000 (2 10:29 +0000)
tree94c96b83635ed87e89e49ed85d1419a48f155799
parentbc619bc019435fd103b14de5f20f863037749a2b
parentc58b8ddd6439ec4707e6445a1ca4befb432cb4bd
Merge remote-tracking branch 'origin/master' into stable