From: jean-claude <jean-claude.charr@univ-fcomte.fr>
Date: Thu, 29 Oct 2015 14:44:46 +0000 (+0100)
Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/mpi-energy2
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/mpi-energy2.git/commitdiff_plain/5f3fce4924f798cbdf119e36bfa8228ad5f922e3?hp=5f3fce4924f798cbdf119e36bfa8228ad5f922e3

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

Conflicts:
	mpi-energy2-extension/Heter_paper.tex
---