From: Loic Baron <sandrine.avakian@inria.fr>
Date: Fri, 30 May 2014 15:00:15 +0000 (+0200)
Subject: Merge branch 'geni-v3' of http://git.onelab.eu/sfa into geni-v3
X-Git-Tag: sfa-3.1-6~2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=97075bf8681b0631bcbee10547cb4c1cb606c907

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

97075bf8681b0631bcbee10547cb4c1cb606c907