Merge remote-tracking branch 'origin/master' into stable
commite4b22e14d726804849209b7edbd45fc385e91be6
authorTails developers <amnesia@boum.org>
Wed, 24 Sep 2014 06:00:10 +0000 (24 06:00 +0000)
committerTails developers <amnesia@boum.org>
Wed, 24 Sep 2014 06:00:10 +0000 (24 06:00 +0000)
treed6194508b1d4892f43e42553fd00277363ad0033
parenta590b07cc133858a6f63573917ca6e1024aa2e0b
parentb2ed32585b9572bec4dc7d3e093d57117017ba91
Merge remote-tracking branch 'origin/master' into stable