From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 21 Nov 2017 16:46:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: v3.18~272^2~3^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/99ee786a00c5a626f69d22a0130145cf1b998fe1

Merge remote-tracking branch 'github/master'
---

99ee786a00c5a626f69d22a0130145cf1b998fe1