Merge remote-tracking branch 'origin/5.4' 89/10689/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 5 Mar 2013 08:19:15 +0000 (09:19 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 5 Mar 2013 08:19:15 +0000 (09:19 +0100)
commit661360e53dc9e9a316f1c6970a6bd4e983088664
treea9908f1dace701c70e50f5d0f66be57e753acf6e
parentf7eea29b06fa5545fa49c042ee47f65215d40331
parentb7208b1ec006331b3e9fd5f21afd69df33cd4d37
Merge remote-tracking branch 'origin/5.4'

Conflicts:
SEP/INDEX

Change-Id: I77e9e04edc90feb87c03f907c44fc3138568fda9
SEP/INDEX
scilab/CHANGES_5.4.X