Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorLoic Baron <loic.baron@lip6.fr>
Fri, 14 Feb 2014 16:30:49 +0000 (17:30 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 14 Feb 2014 16:30:49 +0000 (17:30 +0100)

Trivial merge