Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Fri, 18 Dec 2015 10:54:20 +0000 (11:54 +0100)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Fri, 18 Dec 2015 10:54:20 +0000 (11:54 +0100)

Trivial merge