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

Trivial merge