From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Thu, 19 Jan 2012 09:38:27 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: exp_20120216~125
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bdaaac614d1bb0ee8e034fa76862068d57e362ee

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

Conflicts:
	examples/msg/chord/chord_stateful.c
---

bdaaac614d1bb0ee8e034fa76862068d57e362ee