Merge branch 'master' of ip4.immae.eu:perso/Denise/lycee/2015-2016
authorDenise sur Titasmo <denise.maurice@normalesup.org>
Fri, 25 Mar 2016 17:21:48 +0000 (18:21 +0100)
committerDenise sur Titasmo <denise.maurice@normalesup.org>
Fri, 25 Mar 2016 17:21:48 +0000 (18:21 +0100)

Trivial merge