Merge branch 'master' of git://git.tails.boum.org/tails
commitcaf73e354d8f551b887fd3f02eabe5147f789456
authorTails developers <amnesia@boum.org>
Sun, 10 Nov 2013 12:42:31 +0000 (10 12:42 +0000)
committerTails developers <amnesia@boum.org>
Sun, 10 Nov 2013 12:42:31 +0000 (10 12:42 +0000)
tree70725251ee5eb86e11e24244c25dac26867012d3
parentbfcb0330ef58c974dab44df3db938c78be534ceb
parent372d7faab8b55f7d8134c13b17d2a56f75342880
Merge branch 'master' of git://git.tails.boum.org/tails