| commit | b98dba7df11de5ddb6aff3f88a7ac8c5863f6100 | |
| author | Tails developers <amnesia@boum.org> | |
| Fri, 6 Dec 2013 19:47:02 +0000 (6 19:47 +0000) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Fri, 6 Dec 2013 19:47:02 +0000 (6 19:47 +0000) | ||
| tree | 5b0c1cd9694fc88c5aa1cd13ca427d13950c9d68 | treesnapshot (tar.gz zip) |
| parent | d21873ad7dc2b7eb1ad665d6657403d661aff10c | commitdiff |
| parent | 42e7ef5f4ca2d6238f03a186a3d89b158f61b3bf | commitdiff |
Merge branch 'testing' into feature/incremental-upgrades