Merge branch 'master' of ip6.immae.eu:perso/Denise/lycee/2015-2016
authorDenise sur Titasmo <denise.maurice@normalesup.org>
Fri, 29 Jan 2016 15:52:00 +0000 (16:52 +0100)
committerDenise sur Titasmo <denise.maurice@normalesup.org>
Fri, 29 Jan 2016 15:52:00 +0000 (16:52 +0100)

Trivial merge