Merge branch 'testing' into develjenkins-build_Tails_ISO_devel-11
commitccecc026ece533f3b206a0b48c5dcc0e0bfd0e25
authorTails developers <amnesia@boum.org>
Wed, 15 May 2013 09:30:01 +0000 (15 11:30 +0200)
committerTails developers <amnesia@boum.org>
Wed, 15 May 2013 09:30:01 +0000 (15 11:30 +0200)
treefeace3cd3811bae2117028b17bf82a70af68fc19
parentc5ea5349b2a2fdefedc6c5ff382e33690d92d4a4
parent0946e1c68b8b96fd71e6c6f4dd0a638cc768e382
Merge branch 'testing' into devel