From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 21 Sep 2012 16:48:32 +0000 (+0200)
Subject: Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
X-Git-Tag: sfa-2.1-15~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=30b26f8f644e2c99673d15c96f2722b746f6fbe2

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

30b26f8f644e2c99673d15c96f2722b746f6fbe2