From: Jordan Augé <sandrine.avakian@inria.fr>
Date: Wed, 20 Aug 2014 13:25:07 +0000 (+0200)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-10~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=432cca980c7eed80284776f05566cf628088f7aa

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

432cca980c7eed80284776f05566cf628088f7aa