Merge remote branch 'origin/eap/23307'

author vsr <vsr@opencascade.com>

Wed, 10 Aug 2016 10:24:49 +0000 (13:24 +0300)

committer vsr <vsr@opencascade.com>

Wed, 10 Aug 2016 10:24:49 +0000 (13:24 +0300)
author vsr <vsr@opencascade.com>
Wed, 10 Aug 2016 10:24:49 +0000 (13:24 +0300)
committer vsr <vsr@opencascade.com>
Wed, 10 Aug 2016 10:24:49 +0000 (13:24 +0300)
diff --cc src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Wed, 10 Aug 2016 10:24:49 +0000 (13:24 +0300)
committer	vsr <vsr@opencascade.com>
	Wed, 10 Aug 2016 10:24:49 +0000 (13:24 +0300)