From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 13 Jan 2014 14:12:23 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~32^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=70f7f4a649912706cca88b09d5b13e4e45c74ca6;hp=-c;p=sfa.git

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

70f7f4a649912706cca88b09d5b13e4e45c74ca6