From: fabienchaix <fabien.chaix@gmail.com>
Date: Tue, 23 Feb 2016 10:01:36 +0000 (+0200)
Subject: Merge pull request #2 from mquinson/master
X-Git-Tag: v3_13~646^2^2~17
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a

Merge pull request #2 from mquinson/master

Importing new commits from the main fork
---

347996b4a10c4e8579080692afa60e0afb88b60a