Merge remote-tracking branch 'origin/master'
commita97e5da023357f27790b76bd22143e57e4e16df6
authorTails developers <amnesia@boum.org>
Sun, 20 Jul 2014 16:20:36 +0000 (20 16:20 +0000)
committerTails developers <amnesia@boum.org>
Sun, 20 Jul 2014 16:20:36 +0000 (20 16:20 +0000)
tree60dea39a0b2458be3a45f295c6cc8e60eee88973
parentcfa728ffdfe6f2c32d9a23fdf6464aa2bbe9c746
parent69ee0ee3903aa0a8960c28f4050fe1b2af08b756
Merge remote-tracking branch 'origin/master'