From: Jean-François Couchot <couchot@couchot.iut-bm.univ-fcomte.fr>
Date: Fri, 21 Dec 2012 13:50:32 +0000 (+0100)
Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/canny
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/canny.git/commitdiff_plain/274073a1e4ae1b4de1220e26626a582a08a890d6?hp=--cc

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

274073a1e4ae1b4de1220e26626a582a08a890d6