Merge remote-tracking branch 'origin/stable' into stable
commit3c96bfb706897afc1d10a11750dcac0f9639930c
authorTails developers <amnesia@boum.org>
Sun, 17 Aug 2014 00:09:33 +0000 (17 00:09 +0000)
committerTails developers <amnesia@boum.org>
Sun, 17 Aug 2014 00:09:33 +0000 (17 00:09 +0000)
tree0c54fac713e991e2cd04b8911b4c6827a1178e36
parent9b62bd105a9a8e05492100895744d9465fda577b
parent7c93984e2fffb1c2e6b5ac5e3d178c69fe7672dc
Merge remote-tracking branch 'origin/stable' into stable