Merge tag 'LIV_TRC6500_2.3.0' into dev_tr65_ACA_860_probleme_gestion_alternats_et_rei... dev_tr65_ACA_860_probleme_gestion_alternats_et_reimplementation_taux_activite
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Thu, 26 Jun 2014 15:52:40 +0000 (17:52 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Thu, 26 Jun 2014 15:52:40 +0000 (17:52 +0200)

Trivial merge