Merge tag 'LIV_TRC6500_2.3.1' into dev_tr65_aca_873_algo_denombrement_vp
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Mon, 21 Jul 2014 12:02:33 +0000 (14:02 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Mon, 21 Jul 2014 12:02:33 +0000 (14:02 +0200)

Trivial merge