From: Alexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Date: Wed, 3 Sep 2014 12:22:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_913_correc... 
X-Git-Tag: debian_7.5_20141208~46^2
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=b577d005586467451ebd44760170f68e941a2918;p=debian6500.git

Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_913_correctif_evf_vau

Conflicts:
	dev/common/libhrtrk/CHANGELOG.txt
	dev/common/libhrtrk/src/version.c
---

b577d005586467451ebd44760170f68e941a2918