From: couturie <couturie@extinction>
Date: Wed, 4 Nov 2015 16:21:01 +0000 (-0500)
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/0076e484aaf253a71c2940d041a25b156fe1646b?hp=0076e484aaf253a71c2940d041a25b156fe1646b

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

Conflicts:
	paper.tex
---