From: Pierre-Nicolas Clauss <pini@tuxfamily.org>
Date: Thu, 31 Mar 2011 15:06:28 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3.6_beta2~72^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a3da8571d918cd3cbee6676bf229886a6a2ac92d?hp=-c

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

a3da8571d918cd3cbee6676bf229886a6a2ac92d