Merge remote-tracking branch 'origin/5.5' 66/16266/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 27 Mar 2015 13:03:04 +0000 (14:03 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 27 Mar 2015 13:03:04 +0000 (14:03 +0100)
commit9b2068e64fdf517f451d71277f4aace8897204b4
tree8b34399e7226b46ae912b6bb0a30520a7f21c0b5
parent1cfbafc6f1ada8974ee4a52f1696bc4d07ef62fd
parent3c44aef6d7a7c9d870ac4cc6003a082f336aef0b
Merge remote-tracking branch 'origin/5.5'

Conflicts:
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html

Change-Id: I2cc39e339204efcc567b0481b12f8fe316e5321a