Merge remote-tracking branch 'origin/light_property' 59/12659/1
Antoine ELIAS [Wed, 25 Sep 2013 12:50:28 +0000 (14:50 +0200)]
Change-Id: I565834fccd2107d5bc11a54c3a5e650b49026957

1  2 
scilab/CHANGES_5.5.X

Simple merge