From: Augustin Degomme <adegomme@gmail.com>
Date: Mon, 2 Dec 2019 12:39:45 +0000 (+0100)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: v3.25~339^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f811b86e08f20b82ac1350bf96d457e6ee96f882

Merge branch 'master' into 'master'

Master

See merge request simgrid/simgrid!23
---

f811b86e08f20b82ac1350bf96d457e6ee96f882