From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Mon, 23 May 2016 14:58:02 +0000 (+0200)
Subject: merge accepted
X-Git-Tag: debian_7.8.10~2^2
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=e3b9448d7471ad154bf0187ea366558b88d66099;hp=--cc;p=debian6500.git

merge accepted
---

e3b9448d7471ad154bf0187ea366558b88d66099