From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Fri, 18 Jul 2014 09:54:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/dev_tr65_nra_ft891_auto_soi_bw_margin' into... 
X-Git-Tag: debian_7.5_20141208~64
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=d873e9f5bcdfa216bdfc4b96827910c1436ba86d;hp=36cd8f9baf6b0f69c4277299f066195598cb5178;p=debian6500.git

Merge remote-tracking branch 'origin/dev_tr65_nra_ft891_auto_soi_bw_margin' into int_tr65_nra_2.3.2

Conflicts:
	dev/code_metier/libSOISeq/src/tab_job.c
---