From: Pierre-Nicolas Clauss <pini@tuxfamily.org>
Date: Fri, 8 Apr 2011 13:10:27 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3.6_beta2~59^2~11^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1dc68fca3f3bd110ddaaf88fb90a8bbb83a584b2?hp=--cc

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

1dc68fca3f3bd110ddaaf88fb90a8bbb83a584b2