Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
Jordan Augé [Wed, 20 Aug 2014 13:25:07 +0000 (15:25 +0200)]

Trivial merge