From: couchot <jf.couchot@gmail.com>
Date: Fri, 14 Nov 2014 09:20:24 +0000 (+0100)
Subject: fusion necessaire
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/canny.git/commitdiff_plain/b32ae50ac6a1fa30903bce7ee91e6e42c13ed3c6?ds=sidebyside;hp=--cc

fusion necessaire
Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/canny
---

b32ae50ac6a1fa30903bce7ee91e6e42c13ed3c6