Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
authorWANG <wang@wang-OptiPlex-780.(none)>
Mon, 26 Aug 2013 14:40:06 +0000 (16:40 +0200)
committerWANG <wang@wang-OptiPlex-780.(none)>
Mon, 26 Aug 2013 14:40:06 +0000 (16:40 +0200)

Trivial merge