Merge remote-tracking branch 'origin/master' into testing
commitfaf735da529bde702c838a0fd67eae990899bb30
authorTails developers <amnesia@boum.org>
Sun, 1 Dec 2013 18:27:32 +0000 (1 18:27 +0000)
committerTails developers <amnesia@boum.org>
Sun, 1 Dec 2013 18:27:32 +0000 (1 18:27 +0000)
tree12108fb3f66be18e531625177baae62711a4ef3d
parent1ada0453b80563631f2492ff839f4eeb92ce67fb
parentf7de667e0d6fe75260ea7f52d3a486f380c20932
Merge remote-tracking branch 'origin/master' into testing
wiki/src/contribute/release_process.mdwn
wiki/src/contribute/release_process/test.mdwn