From: lilia <lilia@agora>
Date: Fri, 10 Oct 2014 11:59:15 +0000 (+0200)
Subject: mMerge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/GMRES2stage
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/GMRES2stage.git/commitdiff_plain/8aeef74d04b37c2601749676e053a538ba3785cd?hp=8aeef74d04b37c2601749676e053a538ba3785cd

mMerge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/GMRES2stage

Conflicts:
	paper.tex
---