edit a.txt
Merge branch 'beproud201307_2' into beproud201310