Merge remote-tracking branch 'origin/master' into YaSp 20/16320/1
Vincent COUVERT [Fri, 3 Apr 2015 13:19:57 +0000 (15:19 +0200)]
Conflicts:
scilab/modules/helptools/data/pages/homepage-en_US.html

Change-Id: I599ff62cb723e09d091683435dc1ab97c2266f60

1  2 
scilab/bin/scilab
scilab/modules/atoms/tests/unit_tests/atomsIsLoaded.tst
scilab/modules/atoms/tests/unit_tests/atomsRemoveList.tst
scilab/modules/helptools/data/pages/homepage-en_US.html

Simple merge