From: jccharr <jccharr@charr.local>
Date: Wed, 26 Mar 2014 10:34:52 +0000 (+0100)
Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/mpi-energy
X-Git-Tag: ispa14_submission~13
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/mpi-energy.git/commitdiff_plain/845f556819a9813a51b3abcb1c400f14d8a9716b?ds=inline;hp=845f556819a9813a51b3abcb1c400f14d8a9716b

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

Conflicts:
	paper.tex
---