fin du minutage
Merge branch 'master' into 20141201-telecomsudparis