Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorMohamed Larabi <mohamed.larabi@inria.fr>
Fri, 13 Dec 2013 10:25:09 +0000 (11:25 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Fri, 13 Dec 2013 10:25:09 +0000 (11:25 +0100)

Trivial merge