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

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

30ab48e9e35dd3cf55081b954dce212d56f00733