From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 16 Dec 2013 12:57:14 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~46
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9e1847550776ca28b60869d8ea42daa89c226ba7;p=sfa.git

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

9e1847550776ca28b60869d8ea42daa89c226ba7