From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Sat, 2 Jun 2012 20:35:14 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3_8~654
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/33d53861f6312ae42985bdc7011c396761125c3d?hp=--cc

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
---

33d53861f6312ae42985bdc7011c396761125c3d