From: suter <frederic.suter@cc.in2p3.fr>
Date: Fri, 22 Jun 2012 13:25:14 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3_8~487
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/aa69ffcb4328c83d2fd380c189c836993859228b

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

aa69ffcb4328c83d2fd380c189c836993859228b