From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Tue, 26 Nov 2013 15:49:11 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-1~13
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1c3e5bfbf19d5d6b553d6d9f065c3e76138200de

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

1c3e5bfbf19d5d6b553d6d9f065c3e76138200de