Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 20 Sep 2013 12:19:53 +0000 (14:19 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 20 Sep 2013 12:19:53 +0000 (14:19 +0200)

Trivial merge