From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 25 Feb 2014 11:49:58 +0000 (+0100)
Subject: Merge bugfix from branch mc-refactor
X-Git-Tag: v3_11~199^2~2^2~19^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6399b037de5d22e37584d156b87f293dbfa16df7?hp=6399b037de5d22e37584d156b87f293dbfa16df7

Merge bugfix from branch mc-refactor

Conflicts:
	src/xbt/mmalloc/mm_diff.c
---