Merge remote-tracking branch 'origin/YaSp' 53/16953/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 3 Aug 2015 13:13:53 +0000 (15:13 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 3 Aug 2015 13:13:53 +0000 (15:13 +0200)
commitb8cce2ed43326673023aa4e3558d527d8bb4f3e3
treeddd58662a9f3b838f554dad6e0a015d97edaf2b0
parentccc5d0ec50bbb44973c6c046838ad2338295ef6f
parent447e05dbfd2d8874709c9781e833f8bb20a0294e
Merge remote-tracking branch 'origin/YaSp'

Conflicts:
scilab/CHANGES_5.6.X

Change-Id: Id915fe8b5050104c1ddb9c21247da7f5d91cd5e1