From: Quintin Jean-Noël <quintinjean-noel@bibi.lan>
Date: Sat, 30 Jul 2011 09:08:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v3_6_2~188
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/39b6ed28636c4d67a0127d8526bf10dbc212cdc9

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

39b6ed28636c4d67a0127d8526bf10dbc212cdc9