From: Alexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Date: Mon, 21 Jul 2014 12:47:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_ACA_871_chemin... 
X-Git-Tag: debian_7.5_20141208~63^2~1
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=c49df00acffa19c33389237654c94f1780852029;p=debian6500.git

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

Conflicts:
	dev/code_metier/libPist/src/libpist.c
---

c49df00acffa19c33389237654c94f1780852029