From: Karine Deschinkel Date: Fri, 20 Feb 2015 09:07:20 +0000 (+0100) Subject: Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/LiCO X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/LiCO.git/commitdiff_plain/69295a437968b7724acd8bc875a6b8943817854a?hp=69295a437968b7724acd8bc875a6b8943817854a Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/LiCO ---