From: Kahina <kahina@kahina-VPCEH3K1E.(none)>
Date: Wed, 4 Nov 2015 11:15:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/kahina_paper1
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/kahina_paper1.git/commitdiff_plain/e190c5da7c414d75199c2179a1d0268f4171c6c9?hp=e190c5da7c414d75199c2179a1d0268f4171c6c9

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

Conflicts:
	paper.tex
---