From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Fri, 13 Jan 2017 13:51:40 +0000 (+0100)
Subject: Merge branch 'master' into cgt/devCEA
X-Git-Tag: V_2.7.0~344
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5f2b8e1caecd7b637e35ad001344539bd0c09906;p=modules%2Fshaper.git

Merge branch 'master' into cgt/devCEA
---

5f2b8e1caecd7b637e35ad001344539bd0c09906