Merge branch 'master' of ip6.immae.eu:perso/Denise/lycee/2015-2016
authorDenise sur Titasmo <denise.maurice@normalesup.org>
Thu, 18 Feb 2016 12:36:41 +0000 (13:36 +0100)
committerDenise sur Titasmo <denise.maurice@normalesup.org>
Thu, 18 Feb 2016 12:36:41 +0000 (13:36 +0100)

Trivial merge