Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 27 May 2013 13:28:54 +0000 (15:28 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 27 May 2013 13:28:54 +0000 (15:28 +0200)

Trivial merge