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

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

9c3cac874af848af973114e20622b8dddb7947ab