Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 29 Oct 2013 14:01:45 +0000 (15:01 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 29 Oct 2013 14:01:45 +0000 (15:01 +0100)

Trivial merge