Merge branch 'master' of ip6.immae.eu:perso/Denise/lycee/2015-2016
authorDenise sur Titasmo <denise.maurice@normalesup.org>
Fri, 19 Feb 2016 09:47:08 +0000 (10:47 +0100)
committerDenise sur Titasmo <denise.maurice@normalesup.org>
Fri, 19 Feb 2016 09:47:08 +0000 (10:47 +0100)

Trivial merge