From: Pierre Veyre <pierre.veyre@cc.in2p3.fr>
Date: Mon, 7 Oct 2013 08:52:18 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_9_90~39
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/eaecea92dde01d850f6da36ec4cdfe86992a0f68?ds=sidebyside

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

Conflicts:
	src/surf/storage.c
---

eaecea92dde01d850f6da36ec4cdfe86992a0f68