From: Jonathan Rouzaud-Cornabas <jonathan.rouzaud-cornabas@ens-lyon.fr>
Date: Thu, 29 Nov 2012 11:41:13 +0000 (-0600)
Subject: Merge branch 'vmtrace' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid... 
X-Git-Tag: v3_9_90~569^2~19^2~8^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/674b3b9045034e1563df4df481231fdb1c2608d5

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

674b3b9045034e1563df4df481231fdb1c2608d5