From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Wed, 30 Nov 2011 08:45:40 +0000 (+0100)
Subject: Merge branch 'master' into MC_LTL
X-Git-Tag: exp_20120216~133^2~28
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c912b7d6e75473bd05731ccf77f3e2d82afb7802

Merge branch 'master' into MC_LTL
---

c912b7d6e75473bd05731ccf77f3e2d82afb7802