From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 7 Jan 2016 21:52:53 +0000 (+0100)
Subject: Merge pull request #45 from mpoquet/master
X-Git-Tag: v3_13~1315^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/79f2c630c9587d494cb154e6d074294c1e23208e

Merge pull request #45 from mpoquet/master

Patch candidate for issue 15
---

79f2c630c9587d494cb154e6d074294c1e23208e