Merge remote-tracking branch 'matsa/testing' into testingjenkins-build_Tails_ISO_testing-13jenkins-build_Tails_ISO_testing-14
| commit | 352cf0af529a584fa04b3c60f83fb68e99675d09 | |
| author | Tails developers <amnesia@boum.org> | |
| Tue, 18 Jun 2013 06:38:26 +0000 (18 08:38 +0200) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Tue, 18 Jun 2013 06:38:26 +0000 (18 08:38 +0200) | ||
| tree | a0365e37d26c8a7eb83f1bee24d42036550a8501 | treesnapshot (tar.gz zip) |
| parent | 5a8683fce70d0f028b5052562d6801c125dc73c1 | commitdiff |
| parent | 7df55594c9bc9f4f994c362d6f568861c7b39f2e | commitdiff |
Merge remote-tracking branch 'matsa/testing' into testing