From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 30 Nov 2012 08:24:53 +0000 (+0100)
Subject: Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
X-Git-Tag: sfa-2.1-20~10
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7f74bd28d305656417a6a19caa0cbceba81d1b66

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

7f74bd28d305656417a6a19caa0cbceba81d1b66