Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorJordan Augé <sandrine.avakian@inria.fr>
Wed, 20 Aug 2014 13:25:07 +0000 (15:25 +0200)
committerJordan Augé <sandrine.avakian@inria.fr>
Wed, 20 Aug 2014 13:25:07 +0000 (15:25 +0200)

Trivial merge