From: Navarrop <Pierre.Navarro@imag.fr>
Date: Fri, 1 Apr 2011 11:50:27 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3.6_beta2~72
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/494eca1a42ac767979d8f8ea8762040008bea41a

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

494eca1a42ac767979d8f8ea8762040008bea41a