From: Saint-Marcel Frederic <frederic.saint-marcel@inria.fr>
Date: Fri, 17 Jan 2014 15:14:22 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~10
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=052c6312775ec28935be61da82bb5060c31c4cc9

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

052c6312775ec28935be61da82bb5060c31c4cc9