From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Thu, 16 Jun 2016 13:31:55 +0000 (+0200)
Subject: Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
X-Git-Tag: debian_7.8.10~2
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=5eafe8610e898a37c8fedb906ef3fde0a8ac72c3;hp=--cc;p=debian6500.git

Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500

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

5eafe8610e898a37c8fedb906ef3fde0a8ac72c3
diff --cc master/root/bin/colorlog
index c261b7d,7e0ae00..7e0ae00
mode 100755,100644..100755
--- a/master/root/bin/colorlog
+++ b/master/root/bin/colorlog