From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 25 Jun 2013 07:17:21 +0000 (+0200)
Subject: Merge branch 'master' into sfa-geni-v3
X-Git-Tag: tests-5.3-1~4
X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=88ce17543e3f87197e7d6fd792ea56d99b7d67c3

Merge branch 'master' into sfa-geni-v3
---

88ce17543e3f87197e7d6fd792ea56d99b7d67c3