From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 1 Dec 2016 19:45:56 +0000 (+0100)
Subject: Merge pull request #124 from mpoquet/master
X-Git-Tag: v3_14~131^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/88f3afc8242d846a48213e322417d2bc1abb936c?hp=-c

Merge pull request #124 from mpoquet/master

[Energy platform parsing] assert + memory leak
---

88f3afc8242d846a48213e322417d2bc1abb936c