Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 22 Feb 2013 15:13:31 +0000 (16:13 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 22 Feb 2013 15:13:31 +0000 (16:13 +0100)

Trivial merge