From: Pierre-Nicolas Clauss <pini@tuxfamily.org>
Date: Tue, 29 Mar 2011 11:19:43 +0000 (+0200)
Subject: Merge remote branch 'github/master'
X-Git-Tag: exp_20120216~559^2^2~3^2~1^2^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b8ca930988a5f9573c38d7c64fc911df3a0051df

Merge remote branch 'github/master'
---

b8ca930988a5f9573c38d7c64fc911df3a0051df