Merge remote-tracking branch 'origin/int_tr64_nra_2.3.2' into dev_tr65_aca_882_pb_evf...
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Fri, 18 Jul 2014 09:23:21 +0000 (11:23 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Fri, 18 Jul 2014 09:23:21 +0000 (11:23 +0200)

Trivial merge