Merge remote-tracking branch 'origin/similan' 67/12267/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 13 Aug 2013 09:01:19 +0000 (11:01 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 13 Aug 2013 09:01:45 +0000 (11:01 +0200)
commit35f62bfc7b015b74109e42888426917ce341301e
treec07e41e5498e3127ea2215ba7660f24bcfb71aac
parent5f06e54c6713ea5e4fc732d03a52086d79e4b278
parent681497a5db88b7a24f0257e511db887af7134dcc
Merge remote-tracking branch 'origin/similan'

Change-Id: I2b35528ff241b79968cded0ad7ec967fa2e557b5