From: Kahina <kahina@kahina-VPCEH3K1E.(none)>
Date: Tue, 19 Jan 2016 15:00:41 +0000 (+0100)
Subject: Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/kahina_paper2
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/kahina_paper2.git/commitdiff_plain/8a93d3c37ee0e98d96db8d22eeaa5aa4c6af204c?hp=8a93d3c37ee0e98d96db8d22eeaa5aa4c6af204c

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

Conflicts:
	paper.tex
---