Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
authorWANG <wang@wang-OptiPlex-780.(none)>
Fri, 27 Sep 2013 15:08:04 +0000 (17:08 +0200)
committerWANG <wang@wang-OptiPlex-780.(none)>
Fri, 27 Sep 2013 15:08:04 +0000 (17:08 +0200)

Trivial merge