Test Git
Test Git
Test Git
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projet_GL_2012/build.xml
Merge remote-tracking branch 'origin/master'