From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 7 Nov 2013 20:43:10 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-1~48
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=cc8495078fb3e681cf38b47393255eb33b199f4c

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

cc8495078fb3e681cf38b47393255eb33b199f4c