From: couturie <couturie@extinction>
Date: Mon, 2 Nov 2015 15:27:10 +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/fdf9cfcaf024c24f7267f0607df21769521431d9?hp=--cc

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

Conflicts:
	paper.tex
---

fdf9cfcaf024c24f7267f0607df21769521431d9