Merge branch 'OOP' of https://scm.cri.ensmp.fr/git/Faustine into OOP
authorWANG <wang@wang-OptiPlex-780.(none)>
Tue, 30 Jul 2013 08:11:43 +0000 (10:11 +0200)
committerWANG <wang@wang-OptiPlex-780.(none)>
Tue, 30 Jul 2013 08:11:43 +0000 (10:11 +0200)

Trivial merge