Merge remote-tracking branch 'origin/dev_tr65_nra_ft891_auto_soi_bw_margin' into...
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 18 Jul 2014 09:54:18 +0000 (11:54 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 18 Jul 2014 09:54:18 +0000 (11:54 +0200)
Conflicts:
dev/code_metier/libSOISeq/src/tab_job.c


Trivial merge