Merge branch 'master' of git://git.tails.boum.org/tails
commitc3eb565fb7339abf3a4f250d301656fd8a27f8f2
authorTails developers <amnesia@boum.org>
Sun, 24 Aug 2014 11:32:10 +0000 (24 11:32 +0000)
committerTails developers <amnesia@boum.org>
Sun, 24 Aug 2014 11:32:10 +0000 (24 11:32 +0000)
tree2aa6c506b2d57cd2305310c2cdbf1b3f6a0bfb2f
parent171816153ea102561edbf4d7fbd508f4dcb28ca3
parent655d764462cd4a5e7214cc0ba581b0b755330040
Merge branch 'master' of git://git.tails.boum.org/tails