salut master
merge r6 into master
final commit
file MASTER
Merge branch 'master' into r6
R6 FAILED
CONFLIT COMMIT
Merge branch 'master' into r6
MASTER R6
MASTER MASTER
FUSION
Exclusive R6_commit
master commit
master r6
merge