Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
fsaintma [Wed, 10 Jun 2015 07:23:47 +0000 (09:23 +0200)]

Trivial merge