Merge branch 'V7_main'

author abn <adrien.bruneton@cea.fr>

Wed, 11 Mar 2015 15:31:22 +0000 (16:31 +0100)

committer abn <adrien.bruneton@cea.fr>

Wed, 11 Mar 2015 15:31:22 +0000 (16:31 +0100)
author abn <adrien.bruneton@cea.fr>
Wed, 11 Mar 2015 15:31:22 +0000 (16:31 +0100)
committer abn <adrien.bruneton@cea.fr>
Wed, 11 Mar 2015 15:31:22 +0000 (16:31 +0100)
diff --cc dev/git/Git_Simple_Write_Procedure.rst
Simple merge
author	abn <adrien.bruneton@cea.fr>
	Wed, 11 Mar 2015 15:31:22 +0000 (16:31 +0100)
committer	abn <adrien.bruneton@cea.fr>
	Wed, 11 Mar 2015 15:31:22 +0000 (16:31 +0100)