Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 22 Oct 2013 09:45:04 +0000 (11:45 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 22 Oct 2013 09:45:04 +0000 (11:45 +0200)

Trivial merge