From: couchot <jf.couchot@gmail.com>
Date: Mon, 9 Sep 2013 08:04:24 +0000 (+0200)
Subject: merge
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/canny.git/commitdiff_plain/dd86a49a6884ba85ab2469757bbec464943ad7e5?hp=dd86a49a6884ba85ab2469757bbec464943ad7e5

merge
---