From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 18 Apr 2013 09:51:24 +0000 (+0200)
Subject: Merge branches 'master' and 'master' of ssh://git.onelab.eu/git/tests
X-Git-Tag: tests-5.2-2~4
X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=2558edc6362cb51361f294c31d325d9c60d89b8d

Merge branches 'master' and 'master' of ssh://git.onelab.eu/git/tests
---

2558edc6362cb51361f294c31d325d9c60d89b8d