Merge branch 'master' of git://git.tails.boum.org/tailsmaster
commitbc9baaf0d9a8bcdfbc0b0861a0621ef684647484
authorBessemer <bessemer@tormail.org>
Sat, 27 Jul 2013 09:12:16 +0000 (27 10:12 +0100)
committerBessemer <bessemer@tormail.org>
Sat, 27 Jul 2013 09:12:16 +0000 (27 10:12 +0100)
treea7a332104c2469ebfe53bb624c15844018f80295
parenta94a54b144630acc4851acd2e58533acc010d7ef
parent96ca9d93d9bb3727059e0f819f6d2a831fdee91b
Merge branch 'master' of git://git.tails.boum.org/tails

Pull from origin
wiki/src/contribute/build.mdwn
wiki/src/contribute/release_process.mdwn