From: Saint-Marcel Frederic <frederic.saint-marcel@inria.fr>
Date: Fri, 23 May 2014 09:44:55 +0000 (+0200)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-5~21
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a9fe96f0ac24fc9ec75da0924aa31712b7a08e8e

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

a9fe96f0ac24fc9ec75da0924aa31712b7a08e8e