Merge branch 'master' into V7_5_BR

author vsr <vsr@opencascade.com>

Tue, 9 Dec 2014 08:16:18 +0000 (11:16 +0300)

committer vsr <vsr@opencascade.com>

Tue, 9 Dec 2014 08:16:18 +0000 (11:16 +0300)
author vsr <vsr@opencascade.com>
Tue, 9 Dec 2014 08:16:18 +0000 (11:16 +0300)
committer vsr <vsr@opencascade.com>
Tue, 9 Dec 2014 08:16:18 +0000 (11:16 +0300)
diff --cc src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
Simple merge
author	vsr <vsr@opencascade.com>
	Tue, 9 Dec 2014 08:16:18 +0000 (11:16 +0300)
committer	vsr <vsr@opencascade.com>
	Tue, 9 Dec 2014 08:16:18 +0000 (11:16 +0300)