edit a.txt
edit c.txt
Merge branch 'beproud201307_2' into beproud201310
Merge branch 'beproud201310' into beproud201311