From: couchot <jf.couchot@gmail.com>
Date: Sat, 20 Sep 2014 19:30:15 +0000 (+0200)
Subject: Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/canny
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/canny.git/commitdiff_plain/56c2b1be255aa25e9a09a24734f332daf0176789?hp=--cc

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

56c2b1be255aa25e9a09a24734f332daf0176789