From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 14 Feb 2014 16:30:49 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~3
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=c7be98e6724ddf046a8b15e7762f2e55f0cedb64

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

c7be98e6724ddf046a8b15e7762f2e55f0cedb64