From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 11 Jan 2013 07:05:17 +0000 (+0100)
Subject: Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
X-Git-Tag: sfa-2.1-23~26^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8e965651869430c170112fc43fc09fe2de6ab060

Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
---

8e965651869430c170112fc43fc09fe2de6ab060