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

Trivial merge