From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 14 Jan 2013 22:56:18 +0000 (+0100)
Subject: Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
X-Git-Tag: sfa-2.1-23~8^2~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cbb10dd41dd3abb2a9896eb01aeedd35669f5e95;p=sfa.git

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

cbb10dd41dd3abb2a9896eb01aeedd35669f5e95