Merge remote-tracking branch 'origin/dev_tr65_ACA_860_probleme_gestion_alternats_et_r...
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 2 Jul 2014 09:08:37 +0000 (11:08 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 2 Jul 2014 09:08:37 +0000 (11:08 +0200)
commitcd8225a9e0a574f347a476e57151c2c689a66887
treebb0a630a6bf7ed93060b008d9d2372c1f7d36e1b
parent9418c7201f4ac70501abfc99204607dc255abeba
parent99e332505e367cff03a78c1350a35a14f5d3cf53
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