Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 14 Feb 2013 09:36:40 +0000 (10:36 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 14 Feb 2013 09:36:40 +0000 (10:36 +0100)

Trivial merge