From: suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 20 Jun 2012 13:40:02 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3_8~556
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5afc65bd97bab6b7995d028d97d344bd10cf9c2d?hp=-c

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

5afc65bd97bab6b7995d028d97d344bd10cf9c2d