Merge remote-tracking branch 'tchou/master'
commit4d9228533974da4d26b3b0359fc472af51da648c
authorTails developers <amnesia@boum.org>
Tue, 27 Jan 2015 16:15:58 +0000 (27 16:15 +0000)
committerTails developers <amnesia@boum.org>
Tue, 27 Jan 2015 16:15:58 +0000 (27 16:15 +0000)
tree7faeac83db8409841778d282f17c8811b4d8b649
parent245f8f9c456975cec0ff115ee11cb9f93ef7d17a
parent8a42c91e30123b16d1d104d84be3ab3b91b8a02e
Merge remote-tracking branch 'tchou/master'