From: vsr <vsr@opencascade.com>
Date: Mon, 6 Jun 2016 08:40:38 +0000 (+0300)
Subject: Merge remote branch 'origin/V7_dev'
X-Git-Tag: V8_1_0a1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a87a08f59deb969278f732bd28ef0c8413e97723;p=tools%2Fyacsgen.git

Merge remote branch 'origin/V7_dev'

Conflicts:
	module_generator/yacsgen_version.py
---

a87a08f59deb969278f732bd28ef0c8413e97723