Merge branch 'testing' into develjenkins-build_Tails_ISO_devel-21jenkins-build_Tails_ISO_devel-22jenkins-build_Tails_ISO_devel-23jenkins-build_Tails_ISO_devel-24
| commit | 1c5b2ad40e25e982d0b520e9e7eee72cf2f932d6 | |
| author | Tails developers <amnesia@boum.org> | |
| Wed, 26 Jun 2013 15:20:15 +0000 (26 15:20 +0000) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Wed, 26 Jun 2013 15:20:15 +0000 (26 17:20 +0200) | ||
| tree | 68afa59502adfa07625440e9536aa3b9b32b0bdf | treesnapshot (tar.gz zip) |
| parent | 13e0d33467e166fa8ac185683a02cbbe2a69aa3c | commitdiff |
| parent | 2efd56e24039af56b72f2d79f1be783f9345858f | commitdiff |
Merge branch 'testing' into devel