From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 12 Aug 2015 19:31:12 +0000 (+0200)
Subject: Merge branch 'master' into S4U
X-Git-Tag: v3_13~1690^2~21
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/983ca84f3ac2d74ba56145026d89bd11f3f096e5?ds=inline

Merge branch 'master' into S4U
---

983ca84f3ac2d74ba56145026d89bd11f3f096e5