Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
Loic Baron [Wed, 4 Mar 2015 12:51:58 +0000 (13:51 +0100)]

Trivial merge