From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 17 Dec 2012 10:17:48 +0000 (+0100)
Subject: Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
X-Git-Tag: sfa-2.1-24~5^2~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a94d461bcc1330c1de36889b879780805842f04b

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

a94d461bcc1330c1de36889b879780805842f04b