From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 18 Dec 2013 14:02:22 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~44
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=38a5b91de2913a5a5501b3b5a74ec01e3b3be3b7

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

38a5b91de2913a5a5501b3b5a74ec01e3b3be3b7