Merge remote-tracking branch 'origin/master' into stable
commit878ff4f0d5b69ac3198e6fd22ad1a4f9f65ed077
authorTails developers <amnesia@boum.org>
Thu, 27 Nov 2014 19:27:52 +0000 (27 19:27 +0000)
committerTails developers <amnesia@boum.org>
Thu, 27 Nov 2014 19:27:52 +0000 (27 19:27 +0000)
tree51e241614c16534cfdc9c05b1eeedc030d5d06d4
parent2eee71786d5d07d6a8773ec7f2eb621e2d4f4c2d
parentcb6087f621a6391d1bc59a4bd61970e1f6c9fdac
Merge remote-tracking branch 'origin/master' into stable
wiki/src/contribute/design.mdwn