Merge remote-tracking branch 'origin/master' into stable
commitbe5344fd157d24a0d1ef26a5cf325a8b837b076e
authorTails developers <amnesia@boum.org>
Tue, 2 Dec 2014 10:30:14 +0000 (2 11:30 +0100)
committerTails developers <amnesia@boum.org>
Tue, 2 Dec 2014 10:30:14 +0000 (2 11:30 +0100)
treed120ab3f9aa1ba3d7421b7bcb6ad6cb91c9153ea
parent7afe4df217e0822d8e4611b76329ac9582e973db
parent81f38a17d61e3fe394fdc368645da039ffdf475e
Merge remote-tracking branch 'origin/master' into stable