From: raphael couturier <couturie@extinction>
Date: Tue, 24 Feb 2015 18:17:29 +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/5178f772a789c49b261c48acc466a982d413a9a9?ds=inline;hp=--cc

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

5178f772a789c49b261c48acc466a982d413a9a9