From: Christophe Guyeux <guyeux@gmail.com>
Date: Fri, 10 Oct 2014 14:33:01 +0000 (+0200)
Subject: merge
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/GMRES2stage.git/commitdiff_plain/dfaf80991de90bf68637d2695dec704697458ffa?ds=sidebyside

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

dfaf80991de90bf68637d2695dec704697458ffa