From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 26 Nov 2013 14:46:36 +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^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=24343c5fd971f82d0ae5854a88bd149a4a235d46;p=sfa.git

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

24343c5fd971f82d0ae5854a88bd149a4a235d46