Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 26 Nov 2013 15:49:11 +0000 (16:49 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Tue, 26 Nov 2013 15:49:11 +0000 (16:49 +0100)

Trivial merge