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

Trivial merge