Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 24 Oct 2013 13:58:49 +0000 (15:58 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 24 Oct 2013 13:58:49 +0000 (15:58 +0200)

Trivial merge