From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 25 Mar 2016 11:13:34 +0000 (+0100)
Subject: Merge branch 'master' of github.com:mquinson/simgrid
X-Git-Tag: v3_13~291
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b50d67c58f139517db1b4b5942f47f9847792580?hp=-c

Merge branch 'master' of github.com:mquinson/simgrid
---

b50d67c58f139517db1b4b5942f47f9847792580