From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 5 Nov 2013 17:06:28 +0000 (+0100)
Subject: Merge branch 'v3_10_x'
X-Git-Tag: v3_11_beta~389
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3928c9b3860770cd5efbaa3515e9df6d09273e52

Merge branch 'v3_10_x'
---

3928c9b3860770cd5efbaa3515e9df6d09273e52