From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Mon, 16 Dec 2013 17:44:40 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~44^2~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=01aa57aac6c8f4edf68587e94de8eead60452e00

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

01aa57aac6c8f4edf68587e94de8eead60452e00