From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 4 Mar 2015 12:51:58 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-14~3^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8a6e87c49dd654bd91158d76c0692b1597593784

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

8a6e87c49dd654bd91158d76c0692b1597593784