From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 28 Nov 2012 15:23:50 +0000 (+0100)
Subject: Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
X-Git-Tag: sfa-2.1-19~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8a9f81fc66eb8cb0a89457563917c935e8c5df0b;hp=8a9f81fc66eb8cb0a89457563917c935e8c5df0b;p=sfa.git

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