From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 20 Jul 2016 14:39:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'adfaure/master'
X-Git-Tag: v3_14~737^2~6
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cf75523de37862d1f4eddaa1cbdd276f20755fea?ds=sidebyside

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

cf75523de37862d1f4eddaa1cbdd276f20755fea