From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Thu, 12 Jan 2017 11:24:48 +0000 (+0100)
Subject: Merge branch 'master' into cgt/devCEA
X-Git-Tag: V_2.7.0~346
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fbb1d8a5ead180501e98acaf19acdda4880a2050;p=modules%2Fshaper.git

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

fbb1d8a5ead180501e98acaf19acdda4880a2050