From: fsaintma <frederic.saint-marcel@inria.fr>
Date: Mon, 8 Jun 2015 08:41:14 +0000 (+0200)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-18~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=0eb2fd645abe02f4fbb79d9ebc5a17b292b8dd2d

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

0eb2fd645abe02f4fbb79d9ebc5a17b292b8dd2d