Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 16 Sep 2013 14:01:28 +0000 (16:01 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 16 Sep 2013 14:01:28 +0000 (16:01 +0200)

Trivial merge