From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sun, 1 Mar 2015 07:26:56 +0000 (+0100)
Subject: Merge branch 'master' into noinitscript
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a215a83708958198c47638127e8c11331321721e;p=tests.git

Merge branch 'master' into noinitscript
---

a215a83708958198c47638127e8c11331321721e