From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Wed, 30 Jan 2013 16:14:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: v3_9_90~592^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/373ed09fef634fb125c5039bbc722fbe49e93120

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

373ed09fef634fb125c5039bbc722fbe49e93120