From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Wed, 14 Jun 2017 14:27:36 +0000 (+0200)
Subject: Merge branch 'master' into ngr/python3_dev
X-Git-Tag: V9_0_0~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f11ce594d7ba33f259d2044089ce8d43184ad5bb;p=tools%2Fconfiguration.git

Merge branch 'master' into ngr/python3_dev
---

f11ce594d7ba33f259d2044089ce8d43184ad5bb