From: afanfakh <afanfakh@fanfakh.afanfakh>
Date: Tue, 25 Mar 2014 13:57:12 +0000 (+0100)
Subject: Merge ssh://info.iut-bm.univ-fcomte.fr/mpi-energy
X-Git-Tag: ispa14_submission~21
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/mpi-energy.git/commitdiff_plain/fc20676487bb4d1c3cbbb02b997cb299156b00b5?ds=sidebyside;hp=fc20676487bb4d1c3cbbb02b997cb299156b00b5

Merge ssh://info.iut-bm.univ-fcomte.fr/mpi-energy

Conflicts:
	paper.tex
---