From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 13 Dec 2013 14:35:44 +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
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a0ecdcce6c47700324b8cdb94951ab11392b4642;p=sfa.git

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

a0ecdcce6c47700324b8cdb94951ab11392b4642