Merge remote branch 'origin/V7_dev'

author vsr <vsr@opencascade.com>

Tue, 12 Apr 2016 13:43:47 +0000 (16:43 +0300)

committer vsr <vsr@opencascade.com>

Tue, 12 Apr 2016 13:43:47 +0000 (16:43 +0300)
author vsr <vsr@opencascade.com>
Tue, 12 Apr 2016 13:43:47 +0000 (16:43 +0300)
committer vsr <vsr@opencascade.com>
Tue, 12 Apr 2016 13:43:47 +0000 (16:43 +0300)
diff --cc src/Session/SALOME_Session_Server.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Tue, 12 Apr 2016 13:43:47 +0000 (16:43 +0300)
committer	vsr <vsr@opencascade.com>
	Tue, 12 Apr 2016 13:43:47 +0000 (16:43 +0300)