From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 10 Dec 2013 13:05:53 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~51
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=fae309c53ba7e65f1b51047d8c8fbb7a10477713

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

fae309c53ba7e65f1b51047d8c8fbb7a10477713