From: Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Date: Tue, 9 Dec 2014 16:21:10 +0000 (+0100)
Subject: Merge branch 'master' into omu/SalomeLauncher
X-Git-Tag: V7_6_0a1~29^2~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cca750d0050e94eae9ea9ca05bee79a3ce454882;p=modules%2Fkernel.git

Merge branch 'master' into omu/SalomeLauncher
---

cca750d0050e94eae9ea9ca05bee79a3ce454882