Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 14 Mar 2013 12:22:55 +0000 (13:22 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 14 Mar 2013 12:22:55 +0000 (13:22 +0100)

Trivial merge