From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 21 Nov 2014 07:56:14 +0000 (+0100)
Subject: Merge branch 'xp'
X-Git-Tag: v3_12~732^2~202
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7f1d341f19bd23220e7ee509cd9dccb8eaef3a50?hp=39d3a0153b242aa016bdc528c9268a958bcd98d2

Merge branch 'xp'
---