From: fabienchaix <fabien.chaix@gmail.com>
Date: Tue, 2 Feb 2016 06:14:31 +0000 (+0200)
Subject: Merge pull request #1 from mquinson/master
X-Git-Tag: v3_13~969^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8d000a773b5ebcd411b28c31de68eeddf804e66b

Merge pull request #1 from mquinson/master

Preparing to merge with new commits
---

8d000a773b5ebcd411b28c31de68eeddf804e66b