Merge branch 'testing' of git://git.tails.boum.org/tails into testing
commit8b843354164a5f4188a876d65b7bfb8371a477f9
authorTails developers <amnesia@boum.org>
Tue, 29 Oct 2013 17:09:22 +0000 (29 17:09 +0000)
committerTails developers <amnesia@boum.org>
Tue, 29 Oct 2013 17:09:22 +0000 (29 17:09 +0000)
treecff19a317d56f4aebef277c1a5aede9863897d3f
parentfbedaf2cfe48444ef6e7de0cfce60cdfef75abb9
parent284b49e341fbf8883266e6c7ea3441cd248b29b6
Merge branch 'testing' of git://git.tails.boum.org/tails into testing