From: Michel Salomon <michel.salomon@univ-fcomte.fr>
Date: Tue, 5 Jan 2016 16:14:43 +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/e0ade9eff447e924d284a39ac11e50707aa6529e?hp=--cc

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

Conflicts:
	PeCO-EO/articleeo.aux
	PeCO-EO/articleeo.log
	PeCO-EO/articleeo.pdf
---

e0ade9eff447e924d284a39ac11e50707aa6529e