From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Wed, 2 Jul 2014 09:08:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/dev_tr65_ACA_860_probleme_gestion_alternats_et_r... 
X-Git-Tag: debian_7.5_20141208~69^2
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=cd8225a9e0a574f347a476e57151c2c689a66887;p=debian6500.git

Merge remote-tracking branch 'origin/dev_tr65_ACA_860_probleme_gestion_alternats_et_reimplementation_taux_activite' into int_tr65_nra_2.3.1

Conflicts:
	dev/code_metier/libGonExt/CHANGELOG.txt
---

cd8225a9e0a574f347a476e57151c2c689a66887