From: Christophe Thiéry <christopho128@gmail.com>
Date: Wed, 20 Apr 2011 13:31:56 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3_6_rc3~134
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4596d90b0c0f0453e4e24c67f3e28fc2bb0f8287?hp=-c

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

4596d90b0c0f0453e4e24c67f3e28fc2bb0f8287