From: RCE <cramamonjisoa@bilbo.iut-bm.univ-fcomte.fr>
Date: Sun, 27 Apr 2014 17:09:56 +0000 (+0200)
Subject: Merge
X-Git-Tag: hpcc2014_submission~57
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/hpcc2014.git/commitdiff_plain/e4b14590c5b948dac64c900d8d83e990a3f79122?hp=e4b14590c5b948dac64c900d8d83e990a3f79122

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

Conflicts:
	hpcc.tex
---