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

Trivial merge