Merge branch 'geni-v3' of http://git.onelab.eu/sfa into geni-v3
authorLoic Baron <sandrine.avakian@inria.fr>
Fri, 30 May 2014 15:00:15 +0000 (17:00 +0200)
committerLoic Baron <sandrine.avakian@inria.fr>
Fri, 30 May 2014 15:00:15 +0000 (17:00 +0200)

Trivial merge