Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Thu, 16 Jun 2016 13:31:55 +0000 (15:31 +0200)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Thu, 16 Jun 2016 13:31:55 +0000 (15:31 +0200)
commit5eafe8610e898a37c8fedb906ef3fde0a8ac72c3
treedf66d2d63d71927cdb7562625b974eaa819bef81
parent7e27fbcf8c6f0d54ce45a763a2173280c1f23c4f
parente3b9448d7471ad154bf0187ea366558b88d66099
Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500

Conflicts:
master/root/bin/colorlog
master/root/bin/colorlog