Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 16 Dec 2013 17:44:40 +0000 (18:44 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Mon, 16 Dec 2013 17:44:40 +0000 (18:44 +0100)

Trivial merge