| commit | b247a308870e4dc15a399f0461b7ac52f982097c | |
| author | Tails developers <amnesia@boum.org> | |
| Wed, 4 Jan 2012 08:59:10 +0000 (4 09:59 +0100) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Wed, 4 Jan 2012 08:59:10 +0000 (4 09:59 +0100) | ||
| tree | 2787a544173508f57c0d22e8117932b9de9d5e17 | treesnapshot (tar.gz zip) |
| parent | 59cd23b23ce099ea2b67a6546cfe81b820e06dac | commitdiff |
| parent | 6be09cdfde3be3ab29574c0f0a6cabad31100b99 | commitdiff |
Merge remote-tracking branch 'origin/master' into testing
Conflicts:
wiki/src/contribute/release_process/test.mdwn
wiki/src/doc/about/openpgp_keys.fr.po
Conflicts:
wiki/src/contribute/release_process/test.mdwn
wiki/src/doc/about/openpgp_keys.fr.po
| wiki/src/doc/about/openpgp_keys.fr.po | diff1 | diff2 | blobhistory |