Merge remote-tracking branch 'matsa/master'
commitac6ae31e0abc19615dfde4a252d8b9b5341f47d3
authorTails developers <amnesia@boum.org>
Tue, 24 Feb 2015 08:30:38 +0000 (24 08:30 +0000)
committerTails developers <amnesia@boum.org>
Tue, 24 Feb 2015 08:30:38 +0000 (24 08:30 +0000)
treec533731bc90c084dfef1a2e958b4b797db538fa2
parent44b8986096ba4816d20bbd310ecf4cc9f29d853e
parent7602e4f377ff6f173c773898bac05fe4123756f8
Merge remote-tracking branch 'matsa/master'