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

Trivial merge