Merge remote-tracking branch 'remotes/origin/master' into SolveSpace

author azv <azv@opencascade.com>

Fri, 23 May 2014 11:44:12 +0000 (15:44 +0400)

committer azv <azv@opencascade.com>

Fri, 23 May 2014 11:44:12 +0000 (15:44 +0400)
author azv <azv@opencascade.com>
Fri, 23 May 2014 11:44:12 +0000 (15:44 +0400)
committer azv <azv@opencascade.com>
Fri, 23 May 2014 11:44:12 +0000 (15:44 +0400)
diff --cc src/SketchSolver/SketchSolver_ConstraintManager.cpp
Simple merge
author	azv <azv@opencascade.com>
	Fri, 23 May 2014 11:44:12 +0000 (15:44 +0400)
committer	azv <azv@opencascade.com>
	Fri, 23 May 2014 11:44:12 +0000 (15:44 +0400)