From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 24 Jul 2014 14:11:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/mc-fastsnapshot' into mc
X-Git-Tag: v3_12~890^2~1^2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/669af35fa6a1fb42422d0844ba289c51554ee4ac

Merge remote-tracking branch 'origin/mc-fastsnapshot' into mc

Conflicts:
	buildtools/Cmake/Flags.cmake
---

669af35fa6a1fb42422d0844ba289c51554ee4ac