From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Mon, 26 May 2014 10:05:12 +0000 (+0200)
Subject: Merge branch 'master' into mc
X-Git-Tag: v3_12~956^2~24
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/eb5b6b0c3c4d9a38bb205b2c8bc9aeeba8674a25

Merge branch 'master' into mc
---

eb5b6b0c3c4d9a38bb205b2c8bc9aeeba8674a25