From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Fri, 13 Dec 2013 10:25:09 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~50^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=91cd07bd7558edb9c81c1d36fddc13cf81aedf55

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

91cd07bd7558edb9c81c1d36fddc13cf81aedf55