Merge remote-tracking branch 'origin/master'
commit8f2e2646093e3f2218748c1e9647d97e31cd2953
authorTails developers <amnesia@boum.org>
Mon, 9 Feb 2015 15:35:12 +0000 (9 15:35 +0000)
committerTails developers <amnesia@boum.org>
Mon, 9 Feb 2015 15:35:12 +0000 (9 15:35 +0000)
treed5dce6475b3de30342808424b9f2d4f5d1e4ee95
parent2c85ac0810f8aa91e59e52a327609fdb194377bc
parent6a94b17f6d46bc8ae00763c4a93f86f3b7bc7345
Merge remote-tracking branch 'origin/master'