From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Fri, 8 Nov 2013 23:00:32 +0000 (+0100)
Subject: Merge tag 'v3_10_rc2'
X-Git-Tag: v3_11_beta~341
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b54b0de1100a656106aa33ebb0afa5f1ead365d4?hp=b54b0de1100a656106aa33ebb0afa5f1ead365d4

Merge tag 'v3_10_rc2'

Conflicts:
	CMakeLists.txt
	ChangeLog
---