Merge remote-tracking branch 'origin/master' into testing
commit5a8683fce70d0f028b5052562d6801c125dc73c1
authorTails developers <amnesia@boum.org>
Tue, 18 Jun 2013 06:38:13 +0000 (18 08:38 +0200)
committerTails developers <amnesia@boum.org>
Tue, 18 Jun 2013 06:38:13 +0000 (18 08:38 +0200)
tree79a413646a1cd3bbf0cff188b00efbad1571f3bc
parent3d55328800e58ed964f811a81d0a05db132f1d7e
parent792e051640d36ed033d58ff3dee59a5cc046c642
Merge remote-tracking branch 'origin/master' into testing