From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Wed, 18 Jun 2014 16:02:29 +0000 (+0200)
Subject: Merge branch 'v3_11_x'
X-Git-Tag: v3_12~965^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ce1289d4421b08ce6f69d8203784ee648671972e?hp=ce1289d4421b08ce6f69d8203784ee648671972e

Merge branch 'v3_11_x'

Conflicts:
	examples/msg/properties/msg_prop.c
	examples/simdag/properties/sd_prop.c
---