From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Wed, 30 Jan 2013 01:05:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: v3_9_90~597
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b289e37c7ad67a06a0428b33dc99ccfd15b5fac2

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

b289e37c7ad67a06a0428b33dc99ccfd15b5fac2