Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_aca_873_algo_d...
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Mon, 21 Jul 2014 12:05:14 +0000 (14:05 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Mon, 21 Jul 2014 12:05:14 +0000 (14:05 +0200)

Trivial merge